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 2441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2452 PluginCrashed(plugin_path, plugin_pid)); | 2452 PluginCrashed(plugin_path, plugin_pid)); |
2453 } | 2453 } |
2454 | 2454 |
2455 void WebContentsImpl::OnAppCacheAccessed(const GURL& manifest_url, | 2455 void WebContentsImpl::OnAppCacheAccessed(const GURL& manifest_url, |
2456 bool blocked_by_policy) { | 2456 bool blocked_by_policy) { |
2457 // Notify observers about navigation. | 2457 // Notify observers about navigation. |
2458 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 2458 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
2459 AppCacheAccessed(manifest_url, blocked_by_policy)); | 2459 AppCacheAccessed(manifest_url, blocked_by_policy)); |
2460 } | 2460 } |
2461 | 2461 |
2462 void WebContentsImpl::OnOpenColorChooser(int color_chooser_id, | 2462 void WebContentsImpl::OnOpenColorChooser( |
2463 SkColor color) { | 2463 int color_chooser_id, |
2464 ColorChooser* new_color_chooser = delegate_->OpenColorChooser(this, color); | 2464 SkColor color, |
| 2465 const std::vector<ColorSuggestion>& suggestions) { |
| 2466 ColorChooser* new_color_chooser = |
| 2467 delegate_->OpenColorChooser(this, color, suggestions); |
2465 if (color_chooser_ == new_color_chooser) | 2468 if (color_chooser_ == new_color_chooser) |
2466 return; | 2469 return; |
2467 color_chooser_.reset(new_color_chooser); | 2470 color_chooser_.reset(new_color_chooser); |
2468 color_chooser_identifier_ = color_chooser_id; | 2471 color_chooser_identifier_ = color_chooser_id; |
2469 } | 2472 } |
2470 | 2473 |
2471 void WebContentsImpl::OnEndColorChooser(int color_chooser_id) { | 2474 void WebContentsImpl::OnEndColorChooser(int color_chooser_id) { |
2472 if (color_chooser_ && | 2475 if (color_chooser_ && |
2473 color_chooser_id == color_chooser_identifier_) | 2476 color_chooser_id == color_chooser_identifier_) |
2474 color_chooser_->End(); | 2477 color_chooser_->End(); |
(...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3745 } | 3748 } |
3746 | 3749 |
3747 void WebContentsImpl::ClearAllPowerSaveBlockers() { | 3750 void WebContentsImpl::ClearAllPowerSaveBlockers() { |
3748 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); | 3751 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); |
3749 i != power_save_blockers_.end(); ++i) | 3752 i != power_save_blockers_.end(); ++i) |
3750 STLDeleteValues(&power_save_blockers_[i->first]); | 3753 STLDeleteValues(&power_save_blockers_[i->first]); |
3751 power_save_blockers_.clear(); | 3754 power_save_blockers_.clear(); |
3752 } | 3755 } |
3753 | 3756 |
3754 } // namespace content | 3757 } // namespace content |
OLD | NEW |