| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 2426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2437 PluginCrashed(plugin_path, plugin_pid)); | 2437 PluginCrashed(plugin_path, plugin_pid)); |
| 2438 } | 2438 } |
| 2439 | 2439 |
| 2440 void WebContentsImpl::OnAppCacheAccessed(const GURL& manifest_url, | 2440 void WebContentsImpl::OnAppCacheAccessed(const GURL& manifest_url, |
| 2441 bool blocked_by_policy) { | 2441 bool blocked_by_policy) { |
| 2442 // Notify observers about navigation. | 2442 // Notify observers about navigation. |
| 2443 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 2443 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
| 2444 AppCacheAccessed(manifest_url, blocked_by_policy)); | 2444 AppCacheAccessed(manifest_url, blocked_by_policy)); |
| 2445 } | 2445 } |
| 2446 | 2446 |
| 2447 void WebContentsImpl::OnOpenColorChooser(int color_chooser_id, | 2447 void WebContentsImpl::OnOpenColorChooser( |
| 2448 SkColor color) { | 2448 int color_chooser_id, |
| 2449 ColorChooser* new_color_chooser = delegate_->OpenColorChooser(this, color); | 2449 SkColor color, |
| 2450 const std::vector<ColorSuggestion>& suggestions) { |
| 2451 ColorChooser* new_color_chooser = |
| 2452 delegate_->OpenColorChooser(this, color, suggestions); |
| 2450 if (color_chooser_ == new_color_chooser) | 2453 if (color_chooser_ == new_color_chooser) |
| 2451 return; | 2454 return; |
| 2452 color_chooser_.reset(new_color_chooser); | 2455 color_chooser_.reset(new_color_chooser); |
| 2453 color_chooser_identifier_ = color_chooser_id; | 2456 color_chooser_identifier_ = color_chooser_id; |
| 2454 } | 2457 } |
| 2455 | 2458 |
| 2456 void WebContentsImpl::OnEndColorChooser(int color_chooser_id) { | 2459 void WebContentsImpl::OnEndColorChooser(int color_chooser_id) { |
| 2457 if (color_chooser_ && | 2460 if (color_chooser_ && |
| 2458 color_chooser_id == color_chooser_identifier_) | 2461 color_chooser_id == color_chooser_identifier_) |
| 2459 color_chooser_->End(); | 2462 color_chooser_->End(); |
| (...skipping 1248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3708 } | 3711 } |
| 3709 | 3712 |
| 3710 void WebContentsImpl::ClearAllPowerSaveBlockers() { | 3713 void WebContentsImpl::ClearAllPowerSaveBlockers() { |
| 3711 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); | 3714 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); |
| 3712 i != power_save_blockers_.end(); ++i) | 3715 i != power_save_blockers_.end(); ++i) |
| 3713 STLDeleteValues(&power_save_blockers_[i->first]); | 3716 STLDeleteValues(&power_save_blockers_[i->first]); |
| 3714 power_save_blockers_.clear(); | 3717 power_save_blockers_.clear(); |
| 3715 } | 3718 } |
| 3716 | 3719 |
| 3717 } // namespace content | 3720 } // namespace content |
| OLD | NEW |