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/ui/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/host/root_window_host_factory.h" | 8 #include "ash/host/root_window_host_factory.h" |
9 #include "ash/launcher/launcher_types.h" | 9 #include "ash/launcher/launcher_types.h" |
10 #include "ash/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
11 #include "ash/shelf/shelf_widget.h" | 11 #include "ash/shelf/shelf_widget.h" |
12 #include "ash/system/tray/system_tray_delegate.h" | 12 #include "ash/system/tray/system_tray_delegate.h" |
13 #include "ash/wm/window_properties.h" | 13 #include "ash/wm/window_properties.h" |
14 #include "ash/wm/window_util.h" | 14 #include "ash/wm/window_util.h" |
15 #include "base/bind.h" | 15 #include "base/bind.h" |
16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
17 #include "base/prefs/pref_service.h" | 17 #include "base/prefs/pref_service.h" |
18 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
19 #include "chrome/browser/app_mode/app_mode_utils.h" | 19 #include "chrome/browser/app_mode/app_mode_utils.h" |
20 #include "chrome/browser/lifetime/application_lifetime.h" | 20 #include "chrome/browser/lifetime/application_lifetime.h" |
21 #include "chrome/browser/profiles/profile_manager.h" | 21 #include "chrome/browser/profiles/profile_manager.h" |
22 #include "chrome/browser/sessions/tab_restore_service.h" | 22 #include "chrome/browser/sessions/tab_restore_service.h" |
23 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 23 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
24 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" | 24 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" |
25 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" | 25 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" |
| 26 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h" |
26 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 27 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
27 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 28 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
28 #include "chrome/browser/ui/ash/user_action_handler.h" | 29 #include "chrome/browser/ui/ash/user_action_handler.h" |
29 #include "chrome/browser/ui/ash/window_positioner.h" | 30 #include "chrome/browser/ui/ash/window_positioner.h" |
30 #include "chrome/browser/ui/browser.h" | 31 #include "chrome/browser/ui/browser.h" |
31 #include "chrome/browser/ui/browser_commands.h" | 32 #include "chrome/browser/ui/browser_commands.h" |
32 #include "chrome/browser/ui/browser_finder.h" | 33 #include "chrome/browser/ui/browser_finder.h" |
33 #include "chrome/browser/ui/browser_window.h" | 34 #include "chrome/browser/ui/browser_window.h" |
34 #include "chrome/browser/ui/host_desktop.h" | 35 #include "chrome/browser/ui/host_desktop.h" |
35 #include "chrome/common/chrome_notification_types.h" | 36 #include "chrome/common/chrome_notification_types.h" |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 } | 328 } |
328 | 329 |
329 Browser* ChromeShellDelegate::GetTargetBrowser() { | 330 Browser* ChromeShellDelegate::GetTargetBrowser() { |
330 Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); | 331 Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); |
331 if (browser) | 332 if (browser) |
332 return browser; | 333 return browser; |
333 return chrome::FindOrCreateTabbedBrowser( | 334 return chrome::FindOrCreateTabbedBrowser( |
334 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 335 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
335 chrome::HOST_DESKTOP_TYPE_ASH); | 336 chrome::HOST_DESKTOP_TYPE_ASH); |
336 } | 337 } |
| 338 |
| 339 keyboard::KeyboardControllerProxy* |
| 340 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 341 return new AshKeyboardControllerProxy(); |
| 342 } |
OLD | NEW |