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 2319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2330 PluginCrashed(plugin_path, plugin_pid)); | 2330 PluginCrashed(plugin_path, plugin_pid)); |
2331 } | 2331 } |
2332 | 2332 |
2333 void WebContentsImpl::OnAppCacheAccessed(const GURL& manifest_url, | 2333 void WebContentsImpl::OnAppCacheAccessed(const GURL& manifest_url, |
2334 bool blocked_by_policy) { | 2334 bool blocked_by_policy) { |
2335 // Notify observers about navigation. | 2335 // Notify observers about navigation. |
2336 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 2336 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
2337 AppCacheAccessed(manifest_url, blocked_by_policy)); | 2337 AppCacheAccessed(manifest_url, blocked_by_policy)); |
2338 } | 2338 } |
2339 | 2339 |
2340 void WebContentsImpl::OnOpenColorChooser(int color_chooser_id, | 2340 void WebContentsImpl::OnOpenColorChooser( |
2341 SkColor color) { | 2341 int color_chooser_id, |
2342 ColorChooser* new_color_chooser = delegate_->OpenColorChooser(this, color); | 2342 SkColor color, |
| 2343 const std::vector<ColorSuggestion>& suggestions) { |
| 2344 ColorChooser* new_color_chooser = |
| 2345 delegate_->OpenColorChooser(this, color, suggestions); |
2343 if (color_chooser_ == new_color_chooser) | 2346 if (color_chooser_ == new_color_chooser) |
2344 return; | 2347 return; |
2345 color_chooser_.reset(new_color_chooser); | 2348 color_chooser_.reset(new_color_chooser); |
2346 color_chooser_identifier_ = color_chooser_id; | 2349 color_chooser_identifier_ = color_chooser_id; |
2347 } | 2350 } |
2348 | 2351 |
2349 void WebContentsImpl::OnEndColorChooser(int color_chooser_id) { | 2352 void WebContentsImpl::OnEndColorChooser(int color_chooser_id) { |
2350 if (color_chooser_ && | 2353 if (color_chooser_ && |
2351 color_chooser_id == color_chooser_identifier_) | 2354 color_chooser_id == color_chooser_identifier_) |
2352 color_chooser_->End(); | 2355 color_chooser_->End(); |
(...skipping 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3683 } | 3686 } |
3684 | 3687 |
3685 void WebContentsImpl::OnFrameRemoved( | 3688 void WebContentsImpl::OnFrameRemoved( |
3686 RenderViewHostImpl* render_view_host, | 3689 RenderViewHostImpl* render_view_host, |
3687 int64 frame_id) { | 3690 int64 frame_id) { |
3688 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 3691 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
3689 FrameDetached(render_view_host, frame_id)); | 3692 FrameDetached(render_view_host, frame_id)); |
3690 } | 3693 } |
3691 | 3694 |
3692 } // namespace content | 3695 } // namespace content |
OLD | NEW |