Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: chrome/browser/guest_view/web_view/web_view_guest.cc

Issue 301733006: Zoom Extension API (chrome) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/content_settings/tab_specific_content_settings.h" 11 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
12 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 12 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
13 #include "chrome/browser/extensions/api/webview/webview_api.h" 13 #include "chrome/browser/extensions/api/webview/webview_api.h"
14 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 14 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
15 #include "chrome/browser/extensions/extension_renderer_state.h" 15 #include "chrome/browser/extensions/extension_renderer_state.h"
16 #include "chrome/browser/extensions/menu_manager.h" 16 #include "chrome/browser/extensions/menu_manager.h"
17 #include "chrome/browser/extensions/script_executor.h" 17 #include "chrome/browser/extensions/script_executor.h"
18 #include "chrome/browser/favicon/favicon_tab_helper.h" 18 #include "chrome/browser/favicon/favicon_tab_helper.h"
19 #include "chrome/browser/geolocation/geolocation_permission_context.h" 19 #include "chrome/browser/geolocation/geolocation_permission_context.h"
20 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" 20 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
21 #include "chrome/browser/guest_view/guest_view_constants.h" 21 #include "chrome/browser/guest_view/guest_view_constants.h"
22 #include "chrome/browser/guest_view/guest_view_manager.h" 22 #include "chrome/browser/guest_view/guest_view_manager.h"
23 #include "chrome/browser/guest_view/web_view/web_view_constants.h" 23 #include "chrome/browser/guest_view/web_view/web_view_constants.h"
24 #include "chrome/browser/guest_view/web_view/web_view_permission_types.h" 24 #include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
25 #include "chrome/browser/renderer_context_menu/context_menu_delegate.h" 25 #include "chrome/browser/renderer_context_menu/context_menu_delegate.h"
26 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 26 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
27 #include "chrome/browser/ui/pdf/pdf_tab_helper.h" 27 #include "chrome/browser/ui/pdf/pdf_tab_helper.h"
28 #include "chrome/browser/ui/zoom/zoom_controller.h"
28 #include "chrome/common/chrome_version_info.h" 29 #include "chrome/common/chrome_version_info.h"
29 #include "chrome/common/render_messages.h" 30 #include "chrome/common/render_messages.h"
30 #include "content/public/browser/browser_thread.h" 31 #include "content/public/browser/browser_thread.h"
31 #include "content/public/browser/child_process_security_policy.h" 32 #include "content/public/browser/child_process_security_policy.h"
32 #include "content/public/browser/host_zoom_map.h"
33 #include "content/public/browser/native_web_keyboard_event.h" 33 #include "content/public/browser/native_web_keyboard_event.h"
34 #include "content/public/browser/navigation_entry.h" 34 #include "content/public/browser/navigation_entry.h"
35 #include "content/public/browser/notification_details.h" 35 #include "content/public/browser/notification_details.h"
36 #include "content/public/browser/notification_service.h" 36 #include "content/public/browser/notification_service.h"
37 #include "content/public/browser/notification_source.h" 37 #include "content/public/browser/notification_source.h"
38 #include "content/public/browser/notification_types.h" 38 #include "content/public/browser/notification_types.h"
39 #include "content/public/browser/render_process_host.h" 39 #include "content/public/browser/render_process_host.h"
40 #include "content/public/browser/render_view_host.h" 40 #include "content/public/browser/render_view_host.h"
41 #include "content/public/browser/resource_request_details.h" 41 #include "content/public/browser/resource_request_details.h"
42 #include "content/public/browser/site_instance.h" 42 #include "content/public/browser/site_instance.h"
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 guest_web_contents()->GetController().GetCurrentEntryIndex()); 978 guest_web_contents()->GetController().GetCurrentEntryIndex());
979 args->SetInteger(webview::kInternalEntryCount, 979 args->SetInteger(webview::kInternalEntryCount,
980 guest_web_contents()->GetController().GetEntryCount()); 980 guest_web_contents()->GetController().GetEntryCount());
981 args->SetInteger(webview::kInternalProcessId, 981 args->SetInteger(webview::kInternalProcessId,
982 guest_web_contents()->GetRenderProcessHost()->GetID()); 982 guest_web_contents()->GetRenderProcessHost()->GetID());
983 DispatchEvent( 983 DispatchEvent(
984 new GuestViewBase::Event(webview::kEventLoadCommit, args.Pass())); 984 new GuestViewBase::Event(webview::kEventLoadCommit, args.Pass()));
985 985
986 // Update the current zoom factor for the new page. 986 // Update the current zoom factor for the new page.
987 current_zoom_factor_ = content::ZoomLevelToZoomFactor( 987 current_zoom_factor_ = content::ZoomLevelToZoomFactor(
988 content::HostZoomMap::GetZoomLevel(guest_web_contents())); 988 ZoomController::FromWebContents(guest_web_contents())->GetZoomLevel());
989 989
990 if (is_main_frame) { 990 if (is_main_frame) {
991 chromevox_injected_ = false; 991 chromevox_injected_ = false;
992 main_frame_id_ = frame_id; 992 main_frame_id_ = frame_id;
993 } 993 }
994 } 994 }
995 995
996 void WebViewGuest::DidFailProvisionalLoad( 996 void WebViewGuest::DidFailProvisionalLoad(
997 int64 frame_id, 997 int64 frame_id,
998 const base::string16& frame_unique_name, 998 const base::string16& frame_unique_name,
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1425 1425
1426 void WebViewGuest::SetName(const std::string& name) { 1426 void WebViewGuest::SetName(const std::string& name) {
1427 if (name_ == name) 1427 if (name_ == name)
1428 return; 1428 return;
1429 name_ = name; 1429 name_ = name;
1430 1430
1431 Send(new ChromeViewMsg_SetName(routing_id(), name_)); 1431 Send(new ChromeViewMsg_SetName(routing_id(), name_));
1432 } 1432 }
1433 1433
1434 void WebViewGuest::SetZoom(double zoom_factor) { 1434 void WebViewGuest::SetZoom(double zoom_factor) {
1435 ZoomController* zoom_controller =
1436 ZoomController::FromWebContents(guest_web_contents());
1435 double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor); 1437 double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
1436 content::HostZoomMap::SetZoomLevel(guest_web_contents(), zoom_level); 1438 zoom_controller->SetZoomLevel(zoom_level);
1437 1439
1438 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); 1440 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
1439 args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_); 1441 args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);
1440 args->SetDouble(webview::kNewZoomFactor, zoom_factor); 1442 args->SetDouble(webview::kNewZoomFactor, zoom_factor);
1441 DispatchEvent( 1443 DispatchEvent(
1442 new GuestViewBase::Event(webview::kEventZoomChange, args.Pass())); 1444 new GuestViewBase::Event(webview::kEventZoomChange, args.Pass()));
1443 1445
1444 current_zoom_factor_ = zoom_factor; 1446 current_zoom_factor_ = zoom_factor;
1445 } 1447 }
1446 1448
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1591 bool allow, 1593 bool allow,
1592 const std::string& user_input) { 1594 const std::string& user_input) {
1593 WebViewGuest* guest = 1595 WebViewGuest* guest =
1594 WebViewGuest::From(embedder_render_process_id(), new_window_instance_id); 1596 WebViewGuest::From(embedder_render_process_id(), new_window_instance_id);
1595 if (!guest) 1597 if (!guest)
1596 return; 1598 return;
1597 1599
1598 if (!allow) 1600 if (!allow)
1599 guest->Destroy(); 1601 guest->Destroy();
1600 } 1602 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698