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 "chrome/browser/extensions/api/tabs/tabs_api.h" | 5 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "chrome/browser/ui/browser_commands.h" | 37 #include "chrome/browser/ui/browser_commands.h" |
38 #include "chrome/browser/ui/browser_finder.h" | 38 #include "chrome/browser/ui/browser_finder.h" |
39 #include "chrome/browser/ui/browser_iterator.h" | 39 #include "chrome/browser/ui/browser_iterator.h" |
40 #include "chrome/browser/ui/browser_navigator.h" | 40 #include "chrome/browser/ui/browser_navigator.h" |
41 #include "chrome/browser/ui/browser_tabstrip.h" | 41 #include "chrome/browser/ui/browser_tabstrip.h" |
42 #include "chrome/browser/ui/browser_window.h" | 42 #include "chrome/browser/ui/browser_window.h" |
43 #include "chrome/browser/ui/host_desktop.h" | 43 #include "chrome/browser/ui/host_desktop.h" |
44 #include "chrome/browser/ui/panels/panel_manager.h" | 44 #include "chrome/browser/ui/panels/panel_manager.h" |
45 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 45 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
46 #include "chrome/browser/ui/window_sizer/window_sizer.h" | 46 #include "chrome/browser/ui/window_sizer/window_sizer.h" |
47 #include "chrome/browser/ui/zoom/zoom_controller.h" | |
48 #include "chrome/browser/web_applications/web_app.h" | 47 #include "chrome/browser/web_applications/web_app.h" |
49 #include "chrome/common/chrome_switches.h" | 48 #include "chrome/common/chrome_switches.h" |
50 #include "chrome/common/extensions/api/tabs.h" | 49 #include "chrome/common/extensions/api/tabs.h" |
51 #include "chrome/common/extensions/api/windows.h" | 50 #include "chrome/common/extensions/api/windows.h" |
52 #include "chrome/common/extensions/extension_constants.h" | 51 #include "chrome/common/extensions/extension_constants.h" |
53 #include "chrome/common/pref_names.h" | 52 #include "chrome/common/pref_names.h" |
54 #include "chrome/common/url_constants.h" | 53 #include "chrome/common/url_constants.h" |
55 #include "components/pref_registry/pref_registry_syncable.h" | 54 #include "components/pref_registry/pref_registry_syncable.h" |
56 #include "components/translate/core/browser/language_state.h" | 55 #include "components/translate/core/browser/language_state.h" |
57 #include "components/translate/core/common/language_detection_details.h" | 56 #include "components/translate/core/common/language_detection_details.h" |
| 57 #include "components/ui/zoom/zoom_controller.h" |
58 #include "content/public/browser/navigation_controller.h" | 58 #include "content/public/browser/navigation_controller.h" |
59 #include "content/public/browser/navigation_entry.h" | 59 #include "content/public/browser/navigation_entry.h" |
60 #include "content/public/browser/notification_details.h" | 60 #include "content/public/browser/notification_details.h" |
61 #include "content/public/browser/notification_source.h" | 61 #include "content/public/browser/notification_source.h" |
62 #include "content/public/browser/render_process_host.h" | 62 #include "content/public/browser/render_process_host.h" |
63 #include "content/public/browser/render_view_host.h" | 63 #include "content/public/browser/render_view_host.h" |
64 #include "content/public/browser/render_widget_host_view.h" | 64 #include "content/public/browser/render_widget_host_view.h" |
65 #include "content/public/browser/web_contents.h" | 65 #include "content/public/browser/web_contents.h" |
66 #include "content/public/common/url_constants.h" | 66 #include "content/public/common/url_constants.h" |
67 #include "extensions/browser/app_window/app_window.h" | 67 #include "extensions/browser/app_window/app_window.h" |
68 #include "extensions/browser/extension_function_dispatcher.h" | 68 #include "extensions/browser/extension_function_dispatcher.h" |
69 #include "extensions/browser/extension_function_util.h" | 69 #include "extensions/browser/extension_function_util.h" |
70 #include "extensions/browser/extension_host.h" | 70 #include "extensions/browser/extension_host.h" |
| 71 #include "extensions/browser/extension_zoom_request_client.h" |
71 #include "extensions/browser/file_reader.h" | 72 #include "extensions/browser/file_reader.h" |
72 #include "extensions/browser/script_executor.h" | 73 #include "extensions/browser/script_executor.h" |
73 #include "extensions/common/api/extension_types.h" | 74 #include "extensions/common/api/extension_types.h" |
74 #include "extensions/common/constants.h" | 75 #include "extensions/common/constants.h" |
75 #include "extensions/common/error_utils.h" | 76 #include "extensions/common/error_utils.h" |
76 #include "extensions/common/extension.h" | 77 #include "extensions/common/extension.h" |
77 #include "extensions/common/manifest_constants.h" | 78 #include "extensions/common/manifest_constants.h" |
78 #include "extensions/common/manifest_handlers/default_locale_handler.h" | 79 #include "extensions/common/manifest_handlers/default_locale_handler.h" |
79 #include "extensions/common/message_bundle.h" | 80 #include "extensions/common/message_bundle.h" |
80 #include "extensions/common/permissions/permissions_data.h" | 81 #include "extensions/common/permissions/permissions_data.h" |
81 #include "extensions/common/user_script.h" | 82 #include "extensions/common/user_script.h" |
82 #include "skia/ext/image_operations.h" | 83 #include "skia/ext/image_operations.h" |
83 #include "skia/ext/platform_canvas.h" | 84 #include "skia/ext/platform_canvas.h" |
84 #include "third_party/skia/include/core/SkBitmap.h" | 85 #include "third_party/skia/include/core/SkBitmap.h" |
85 #include "ui/base/models/list_selection_model.h" | 86 #include "ui/base/models/list_selection_model.h" |
86 #include "ui/base/ui_base_types.h" | 87 #include "ui/base/ui_base_types.h" |
87 | 88 |
88 #if defined(USE_ASH) | 89 #if defined(USE_ASH) |
89 #include "ash/ash_switches.h" | 90 #include "ash/ash_switches.h" |
90 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h" | 91 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h" |
91 #include "extensions/browser/app_window/app_window_registry.h" | 92 #include "extensions/browser/app_window/app_window_registry.h" |
92 #endif | 93 #endif |
93 | 94 |
94 using content::BrowserThread; | 95 using content::BrowserThread; |
95 using content::NavigationController; | 96 using content::NavigationController; |
96 using content::NavigationEntry; | 97 using content::NavigationEntry; |
97 using content::OpenURLParams; | 98 using content::OpenURLParams; |
98 using content::Referrer; | 99 using content::Referrer; |
99 using content::WebContents; | 100 using content::WebContents; |
| 101 using ui_zoom::ZoomController; |
100 | 102 |
101 namespace extensions { | 103 namespace extensions { |
102 | 104 |
103 namespace windows = api::windows; | 105 namespace windows = api::windows; |
104 namespace keys = tabs_constants; | 106 namespace keys = tabs_constants; |
105 namespace tabs = api::tabs; | 107 namespace tabs = api::tabs; |
106 | 108 |
107 using core_api::extension_types::InjectDetails; | 109 using core_api::extension_types::InjectDetails; |
108 | 110 |
109 namespace { | 111 namespace { |
(...skipping 1734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1844 return false; | 1846 return false; |
1845 | 1847 |
1846 GURL url(web_contents->GetVisibleURL()); | 1848 GURL url(web_contents->GetVisibleURL()); |
1847 if (PermissionsData::IsRestrictedUrl(url, url, extension(), &error_)) | 1849 if (PermissionsData::IsRestrictedUrl(url, url, extension(), &error_)) |
1848 return false; | 1850 return false; |
1849 | 1851 |
1850 ZoomController* zoom_controller = | 1852 ZoomController* zoom_controller = |
1851 ZoomController::FromWebContents(web_contents); | 1853 ZoomController::FromWebContents(web_contents); |
1852 double zoom_level = content::ZoomFactorToZoomLevel(params->zoom_factor); | 1854 double zoom_level = content::ZoomFactorToZoomLevel(params->zoom_factor); |
1853 | 1855 |
1854 if (!zoom_controller->SetZoomLevelByExtension(zoom_level, extension())) { | 1856 scoped_refptr<ExtensionZoomRequestClient> client( |
| 1857 new ExtensionZoomRequestClient(extension())); |
| 1858 if (!zoom_controller->SetZoomLevelByClient(zoom_level, client)) { |
1855 // Tried to zoom a tab in disabled mode. | 1859 // Tried to zoom a tab in disabled mode. |
1856 error_ = keys::kCannotZoomDisabledTabError; | 1860 error_ = keys::kCannotZoomDisabledTabError; |
1857 return false; | 1861 return false; |
1858 } | 1862 } |
1859 | 1863 |
1860 SendResponse(true); | 1864 SendResponse(true); |
1861 return true; | 1865 return true; |
1862 } | 1866 } |
1863 | 1867 |
1864 bool TabsGetZoomFunction::RunAsync() { | 1868 bool TabsGetZoomFunction::RunAsync() { |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1946 ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode(); | 1950 ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode(); |
1947 api::tabs::ZoomSettings zoom_settings; | 1951 api::tabs::ZoomSettings zoom_settings; |
1948 ZoomModeToZoomSettings(zoom_mode, &zoom_settings); | 1952 ZoomModeToZoomSettings(zoom_mode, &zoom_settings); |
1949 | 1953 |
1950 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings); | 1954 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings); |
1951 SendResponse(true); | 1955 SendResponse(true); |
1952 return true; | 1956 return true; |
1953 } | 1957 } |
1954 | 1958 |
1955 } // namespace extensions | 1959 } // namespace extensions |
OLD | NEW |