OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/guest_view/web_view/web_view_guest.h" | 5 #include "chrome/browser/guest_view/web_view/web_view_guest.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
11 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 11 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
12 #include "chrome/browser/extensions/api/webview/webview_api.h" | 12 #include "chrome/browser/extensions/api/webview/webview_api.h" |
13 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" | 13 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" |
14 #include "chrome/browser/extensions/extension_renderer_state.h" | 14 #include "chrome/browser/extensions/extension_renderer_state.h" |
15 #include "chrome/browser/extensions/menu_manager.h" | 15 #include "chrome/browser/extensions/menu_manager.h" |
16 #include "chrome/browser/extensions/script_executor.h" | 16 #include "chrome/browser/extensions/script_executor.h" |
17 #include "chrome/browser/favicon/favicon_tab_helper.h" | 17 #include "chrome/browser/favicon/favicon_tab_helper.h" |
18 #include "chrome/browser/guest_view/guest_view_constants.h" | 18 #include "chrome/browser/guest_view/guest_view_constants.h" |
19 #include "chrome/browser/guest_view/guest_view_manager.h" | 19 #include "chrome/browser/guest_view/guest_view_manager.h" |
20 #include "chrome/browser/guest_view/web_view/web_view_constants.h" | 20 #include "chrome/browser/guest_view/web_view/web_view_constants.h" |
21 #include "chrome/browser/guest_view/web_view/web_view_permission_types.h" | 21 #include "chrome/browser/guest_view/web_view/web_view_permission_types.h" |
22 #include "chrome/browser/renderer_context_menu/context_menu_delegate.h" | 22 #include "chrome/browser/renderer_context_menu/context_menu_delegate.h" |
23 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" | 23 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
24 #include "chrome/browser/ui/zoom/zoom_controller.h" | |
24 #include "chrome/common/chrome_version_info.h" | 25 #include "chrome/common/chrome_version_info.h" |
25 #include "chrome/common/render_messages.h" | 26 #include "chrome/common/render_messages.h" |
26 #include "content/public/browser/browser_thread.h" | 27 #include "content/public/browser/browser_thread.h" |
27 #include "content/public/browser/child_process_security_policy.h" | 28 #include "content/public/browser/child_process_security_policy.h" |
28 #include "content/public/browser/geolocation_permission_context.h" | 29 #include "content/public/browser/geolocation_permission_context.h" |
29 #include "content/public/browser/host_zoom_map.h" | 30 #include "content/public/browser/host_zoom_map.h" |
30 #include "content/public/browser/native_web_keyboard_event.h" | 31 #include "content/public/browser/native_web_keyboard_event.h" |
31 #include "content/public/browser/navigation_entry.h" | 32 #include "content/public/browser/navigation_entry.h" |
32 #include "content/public/browser/notification_details.h" | 33 #include "content/public/browser/notification_details.h" |
33 #include "content/public/browser/notification_service.h" | 34 #include "content/public/browser/notification_service.h" |
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
871 guest_web_contents()->GetController().GetCurrentEntryIndex()); | 872 guest_web_contents()->GetController().GetCurrentEntryIndex()); |
872 args->SetInteger(webview::kInternalEntryCount, | 873 args->SetInteger(webview::kInternalEntryCount, |
873 guest_web_contents()->GetController().GetEntryCount()); | 874 guest_web_contents()->GetController().GetEntryCount()); |
874 args->SetInteger(webview::kInternalProcessId, | 875 args->SetInteger(webview::kInternalProcessId, |
875 guest_web_contents()->GetRenderProcessHost()->GetID()); | 876 guest_web_contents()->GetRenderProcessHost()->GetID()); |
876 DispatchEvent( | 877 DispatchEvent( |
877 new GuestViewBase::Event(webview::kEventLoadCommit, args.Pass())); | 878 new GuestViewBase::Event(webview::kEventLoadCommit, args.Pass())); |
878 | 879 |
879 // Update the current zoom factor for the new page. | 880 // Update the current zoom factor for the new page. |
880 current_zoom_factor_ = content::ZoomLevelToZoomFactor( | 881 current_zoom_factor_ = content::ZoomLevelToZoomFactor( |
881 content::HostZoomMap::GetZoomLevel(guest_web_contents())); | 882 ZoomController::FromWebContents(guest_web_contents())->GetZoomLevel()); |
882 | 883 |
883 if (is_main_frame) { | 884 if (is_main_frame) { |
884 chromevox_injected_ = false; | 885 chromevox_injected_ = false; |
885 main_frame_id_ = frame_id; | 886 main_frame_id_ = frame_id; |
886 } | 887 } |
887 } | 888 } |
888 | 889 |
889 void WebViewGuest::DidFailProvisionalLoad( | 890 void WebViewGuest::DidFailProvisionalLoad( |
890 int64 frame_id, | 891 int64 frame_id, |
891 const base::string16& frame_unique_name, | 892 const base::string16& frame_unique_name, |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1318 | 1319 |
1319 void WebViewGuest::SetName(const std::string& name) { | 1320 void WebViewGuest::SetName(const std::string& name) { |
1320 if (name_ == name) | 1321 if (name_ == name) |
1321 return; | 1322 return; |
1322 name_ = name; | 1323 name_ = name; |
1323 | 1324 |
1324 Send(new ChromeViewMsg_SetName(routing_id(), name_)); | 1325 Send(new ChromeViewMsg_SetName(routing_id(), name_)); |
1325 } | 1326 } |
1326 | 1327 |
1327 void WebViewGuest::SetZoom(double zoom_factor) { | 1328 void WebViewGuest::SetZoom(double zoom_factor) { |
1329 ZoomController* zoom_controller = | |
1330 ZoomController::FromWebContents(guest_web_contents()); | |
1328 double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor); | 1331 double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor); |
1329 content::HostZoomMap::SetZoomLevel(guest_web_contents(), zoom_level); | 1332 // TODO(wjmaclean) Should we talk to HostZoomMap directly instead? |
Fady Samuel
2014/06/12 19:38:58
I don't think so. WebViews should always be in iso
wjmaclean
2014/06/12 19:42:22
Sorry about this ... this comment died (in my mind
| |
1333 zoom_controller->SetZoomLevel(zoom_level); | |
1330 | 1334 |
1331 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); | 1335 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
1332 args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_); | 1336 args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_); |
1333 args->SetDouble(webview::kNewZoomFactor, zoom_factor); | 1337 args->SetDouble(webview::kNewZoomFactor, zoom_factor); |
1334 DispatchEvent( | 1338 DispatchEvent( |
1335 new GuestViewBase::Event(webview::kEventZoomChange, args.Pass())); | 1339 new GuestViewBase::Event(webview::kEventZoomChange, args.Pass())); |
1336 | 1340 |
1337 current_zoom_factor_ = zoom_factor; | 1341 current_zoom_factor_ = zoom_factor; |
1338 } | 1342 } |
1339 | 1343 |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1484 bool allow, | 1488 bool allow, |
1485 const std::string& user_input) { | 1489 const std::string& user_input) { |
1486 WebViewGuest* guest = | 1490 WebViewGuest* guest = |
1487 WebViewGuest::From(embedder_render_process_id(), new_window_instance_id); | 1491 WebViewGuest::From(embedder_render_process_id(), new_window_instance_id); |
1488 if (!guest) | 1492 if (!guest) |
1489 return; | 1493 return; |
1490 | 1494 |
1491 if (!allow) | 1495 if (!allow) |
1492 guest->Destroy(); | 1496 guest->Destroy(); |
1493 } | 1497 } |
OLD | NEW |