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/browser_plugin/browser_plugin_guest.h" | 5 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/pickle.h" | 10 #include "base/pickle.h" |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 while (!pending_messages_.empty()) { | 400 while (!pending_messages_.empty()) { |
401 linked_ptr<IPC::Message> message_ptr = pending_messages_.front(); | 401 linked_ptr<IPC::Message> message_ptr = pending_messages_.front(); |
402 pending_messages_.pop_front(); | 402 pending_messages_.pop_front(); |
403 SendMessageToEmbedder(message_ptr.release()); | 403 SendMessageToEmbedder(message_ptr.release()); |
404 } | 404 } |
405 } | 405 } |
406 | 406 |
407 void BrowserPluginGuest::DidCommitProvisionalLoadForFrame( | 407 void BrowserPluginGuest::DidCommitProvisionalLoadForFrame( |
408 RenderFrameHost* render_frame_host, | 408 RenderFrameHost* render_frame_host, |
409 const GURL& url, | 409 const GURL& url, |
| 410 bool url_is_unreachable, |
410 ui::PageTransition transition_type) { | 411 ui::PageTransition transition_type) { |
411 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.DidNavigate")); | 412 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.DidNavigate")); |
412 } | 413 } |
413 | 414 |
414 void BrowserPluginGuest::RenderViewReady() { | 415 void BrowserPluginGuest::RenderViewReady() { |
415 RenderViewHost* rvh = GetWebContents()->GetRenderViewHost(); | 416 RenderViewHost* rvh = GetWebContents()->GetRenderViewHost(); |
416 // TODO(fsamuel): Investigate whether it's possible to update state earlier | 417 // TODO(fsamuel): Investigate whether it's possible to update state earlier |
417 // here (see http://crbug.com/158151). | 418 // here (see http://crbug.com/158151). |
418 Send(new InputMsg_SetFocus(routing_id(), focused_)); | 419 Send(new InputMsg_SetFocus(routing_id(), focused_)); |
419 UpdateVisibility(); | 420 UpdateVisibility(); |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
804 void BrowserPluginGuest::OnImeCompositionRangeChanged( | 805 void BrowserPluginGuest::OnImeCompositionRangeChanged( |
805 const gfx::Range& range, | 806 const gfx::Range& range, |
806 const std::vector<gfx::Rect>& character_bounds) { | 807 const std::vector<gfx::Rect>& character_bounds) { |
807 static_cast<RenderWidgetHostViewBase*>( | 808 static_cast<RenderWidgetHostViewBase*>( |
808 web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged( | 809 web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged( |
809 range, character_bounds); | 810 range, character_bounds); |
810 } | 811 } |
811 #endif | 812 #endif |
812 | 813 |
813 } // namespace content | 814 } // namespace content |
OLD | NEW |