| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/renderer_host/render_view_host.h" | 5 #include "content/browser/renderer_host/render_view_host.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 | 995 |
| 996 void RenderViewHost::OnMsgDidContentsPreferredSizeChange( | 996 void RenderViewHost::OnMsgDidContentsPreferredSizeChange( |
| 997 const gfx::Size& new_size) { | 997 const gfx::Size& new_size) { |
| 998 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); | 998 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); |
| 999 if (!view) | 999 if (!view) |
| 1000 return; | 1000 return; |
| 1001 view->UpdatePreferredSize(new_size); | 1001 view->UpdatePreferredSize(new_size); |
| 1002 } | 1002 } |
| 1003 | 1003 |
| 1004 void RenderViewHost::OnMsgSelectionChanged(const std::string& text, | 1004 void RenderViewHost::OnMsgSelectionChanged(const std::string& text, |
| 1005 const ui::Range& range) { | 1005 const ui::Range& range, |
| 1006 const gfx::Point& start, |
| 1007 const gfx::Point& end) { |
| 1006 if (view()) | 1008 if (view()) |
| 1007 view()->SelectionChanged(text, range); | 1009 view()->SelectionChanged(text, range, start, end); |
| 1008 } | 1010 } |
| 1009 | 1011 |
| 1010 void RenderViewHost::OnMsgRunJavaScriptMessage( | 1012 void RenderViewHost::OnMsgRunJavaScriptMessage( |
| 1011 const string16& message, | 1013 const string16& message, |
| 1012 const string16& default_prompt, | 1014 const string16& default_prompt, |
| 1013 const GURL& frame_url, | 1015 const GURL& frame_url, |
| 1014 const int flags, | 1016 const int flags, |
| 1015 IPC::Message* reply_msg) { | 1017 IPC::Message* reply_msg) { |
| 1016 // While a JS message dialog is showing, tabs in the same process shouldn't | 1018 // While a JS message dialog is showing, tabs in the same process shouldn't |
| 1017 // process input events. | 1019 // process input events. |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1332 if (view) { | 1334 if (view) { |
| 1333 view->ShowPopupMenu(params.bounds, | 1335 view->ShowPopupMenu(params.bounds, |
| 1334 params.item_height, | 1336 params.item_height, |
| 1335 params.item_font_size, | 1337 params.item_font_size, |
| 1336 params.selected_item, | 1338 params.selected_item, |
| 1337 params.popup_items, | 1339 params.popup_items, |
| 1338 params.right_aligned); | 1340 params.right_aligned); |
| 1339 } | 1341 } |
| 1340 } | 1342 } |
| 1341 #endif | 1343 #endif |
| OLD | NEW |