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/ui/views/apps/chrome_native_app_window_views.h" | 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" |
6 | 6 |
7 #include "apps/ui/views/app_window_frame_view.h" | 7 #include "apps/ui/views/app_window_frame_view.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/app_mode/app_mode_utils.h" | 10 #include "chrome/browser/app_mode/app_mode_utils.h" |
11 #include "chrome/browser/chrome_page_zoom.h" | 11 #include "chrome/browser/chrome_page_zoom.h" |
12 #include "chrome/browser/favicon/favicon_tab_helper.h" | 12 #include "chrome/browser/favicon/favicon_tab_helper.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/host_desktop.h" | 14 #include "chrome/browser/ui/host_desktop.h" |
15 #include "chrome/browser/ui/views/apps/desktop_keyboard_capture.h" | 15 #include "chrome/browser/ui/views/apps/desktop_keyboard_capture.h" |
16 #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h" | 16 #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h" |
17 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" | 17 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" |
18 #include "chrome/browser/ui/views/frame/taskbar_decorator.h" | 18 #include "chrome/browser/ui/views/frame/taskbar_decorator.h" |
19 #include "chrome/browser/ui/zoom/zoom_controller.h" | |
20 #include "chrome/browser/web_applications/web_app.h" | 19 #include "chrome/browser/web_applications/web_app.h" |
21 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
| 21 #include "components/ui/zoom/zoom_controller.h" |
22 #include "extensions/common/extension.h" | 22 #include "extensions/common/extension.h" |
23 #include "ui/aura/window.h" | 23 #include "ui/aura/window.h" |
24 #include "ui/base/hit_test.h" | 24 #include "ui/base/hit_test.h" |
25 #include "ui/base/models/simple_menu_model.h" | 25 #include "ui/base/models/simple_menu_model.h" |
26 #include "ui/gfx/image/image_skia.h" | 26 #include "ui/gfx/image/image_skia.h" |
27 #include "ui/views/controls/menu/menu_runner.h" | 27 #include "ui/views/controls/menu/menu_runner.h" |
28 #include "ui/views/controls/webview/webview.h" | 28 #include "ui/views/controls/webview/webview.h" |
29 #include "ui/views/widget/widget.h" | 29 #include "ui/views/widget/widget.h" |
30 #include "ui/wm/core/easy_resize_window_targeter.h" | 30 #include "ui/wm/core/easy_resize_window_targeter.h" |
31 #include "ui/wm/core/shadow_types.h" | 31 #include "ui/wm/core/shadow_types.h" |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 // to store data and only checks kiosk mode once. If a platform app is | 286 // to store data and only checks kiosk mode once. If a platform app is |
287 // launched before kiosk mode starts, the kiosk accelerators will not be | 287 // launched before kiosk mode starts, the kiosk accelerators will not be |
288 // registered. This DCHECK catches the case. | 288 // registered. This DCHECK catches the case. |
289 DCHECK(!is_kiosk_app_mode || | 289 DCHECK(!is_kiosk_app_mode || |
290 accelerator_table.size() == | 290 accelerator_table.size() == |
291 arraysize(kAppWindowAcceleratorMap) + | 291 arraysize(kAppWindowAcceleratorMap) + |
292 arraysize(kAppWindowKioskAppModeAcceleratorMap)); | 292 arraysize(kAppWindowKioskAppModeAcceleratorMap)); |
293 | 293 |
294 // Ensure there is a ZoomController in kiosk mode, otherwise the processing | 294 // Ensure there is a ZoomController in kiosk mode, otherwise the processing |
295 // of the accelerators will cause a crash. | 295 // of the accelerators will cause a crash. |
296 DCHECK(!is_kiosk_app_mode || | 296 DCHECK(!is_kiosk_app_mode || ui_zoom::ZoomController::FromWebContents( |
297 ZoomController::FromWebContents(web_view()->GetWebContents())); | 297 web_view()->GetWebContents())); |
298 | 298 |
299 for (std::map<ui::Accelerator, int>::const_iterator iter = | 299 for (std::map<ui::Accelerator, int>::const_iterator iter = |
300 accelerator_table.begin(); | 300 accelerator_table.begin(); |
301 iter != accelerator_table.end(); ++iter) { | 301 iter != accelerator_table.end(); ++iter) { |
302 if (is_kiosk_app_mode && !chrome::IsCommandAllowedInAppMode(iter->second)) | 302 if (is_kiosk_app_mode && !chrome::IsCommandAllowedInAppMode(iter->second)) |
303 continue; | 303 continue; |
304 | 304 |
305 focus_manager->RegisterAccelerator( | 305 focus_manager->RegisterAccelerator( |
306 iter->first, ui::AcceleratorManager::kNormalPriority, this); | 306 iter->first, ui::AcceleratorManager::kNormalPriority, this); |
307 } | 307 } |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
707 InitializePanelWindow(create_params); | 707 InitializePanelWindow(create_params); |
708 } else { | 708 } else { |
709 InitializeDefaultWindow(create_params); | 709 InitializeDefaultWindow(create_params); |
710 } | 710 } |
711 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( | 711 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( |
712 Profile::FromBrowserContext(app_window->browser_context()), | 712 Profile::FromBrowserContext(app_window->browser_context()), |
713 widget()->GetFocusManager(), | 713 widget()->GetFocusManager(), |
714 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, | 714 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, |
715 NULL)); | 715 NULL)); |
716 } | 716 } |
OLD | NEW |