| 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 "apps/native_app_window.h" |
| 7 #include "apps/shell_window.h" | 8 #include "apps/shell_window.h" |
| 8 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 9 #include "ash/host/root_window_host_factory.h" | 10 #include "ash/host/root_window_host_factory.h" |
| 10 #include "ash/launcher/launcher_types.h" | 11 #include "ash/launcher/launcher_types.h" |
| 11 #include "ash/magnifier/magnifier_constants.h" | 12 #include "ash/magnifier/magnifier_constants.h" |
| 12 #include "ash/session_state_delegate.h" | 13 #include "ash/session_state_delegate.h" |
| 13 #include "ash/shelf/shelf_widget.h" | 14 #include "ash/shelf/shelf_widget.h" |
| 14 #include "ash/system/tray/system_tray_delegate.h" | 15 #include "ash/system/tray/system_tray_delegate.h" |
| 15 #include "ash/wm/window_properties.h" | 16 #include "ash/wm/window_properties.h" |
| 16 #include "ash/wm/window_util.h" | 17 #include "ash/wm/window_util.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 30 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" | 31 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" |
| 31 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h" | 32 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h" |
| 32 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 33 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| 33 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 34 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
| 34 #include "chrome/browser/ui/ash/user_action_handler.h" | 35 #include "chrome/browser/ui/ash/user_action_handler.h" |
| 35 #include "chrome/browser/ui/ash/window_positioner.h" | 36 #include "chrome/browser/ui/ash/window_positioner.h" |
| 36 #include "chrome/browser/ui/browser.h" | 37 #include "chrome/browser/ui/browser.h" |
| 37 #include "chrome/browser/ui/browser_commands.h" | 38 #include "chrome/browser/ui/browser_commands.h" |
| 38 #include "chrome/browser/ui/browser_finder.h" | 39 #include "chrome/browser/ui/browser_finder.h" |
| 39 #include "chrome/browser/ui/browser_window.h" | 40 #include "chrome/browser/ui/browser_window.h" |
| 40 #include "chrome/browser/ui/extensions/native_app_window.h" | |
| 41 #include "chrome/browser/ui/host_desktop.h" | 41 #include "chrome/browser/ui/host_desktop.h" |
| 42 #include "chrome/browser/ui/immersive_fullscreen_configuration.h" | 42 #include "chrome/browser/ui/immersive_fullscreen_configuration.h" |
| 43 #include "chrome/common/chrome_switches.h" | 43 #include "chrome/common/chrome_switches.h" |
| 44 #include "chrome/common/time_format.h" | 44 #include "chrome/common/time_format.h" |
| 45 #include "content/public/browser/notification_service.h" | 45 #include "content/public/browser/notification_service.h" |
| 46 #include "content/public/browser/user_metrics.h" | 46 #include "content/public/browser/user_metrics.h" |
| 47 #include "grit/chromium_strings.h" | 47 #include "grit/chromium_strings.h" |
| 48 #include "grit/generated_resources.h" | 48 #include "grit/generated_resources.h" |
| 49 #include "ui/aura/client/user_action_client.h" | 49 #include "ui/aura/client/user_action_client.h" |
| 50 #include "ui/aura/window.h" | 50 #include "ui/aura/window.h" |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 return browser; | 445 return browser; |
| 446 return chrome::FindOrCreateTabbedBrowser( | 446 return chrome::FindOrCreateTabbedBrowser( |
| 447 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 447 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
| 448 chrome::HOST_DESKTOP_TYPE_ASH); | 448 chrome::HOST_DESKTOP_TYPE_ASH); |
| 449 } | 449 } |
| 450 | 450 |
| 451 keyboard::KeyboardControllerProxy* | 451 keyboard::KeyboardControllerProxy* |
| 452 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 452 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 453 return new AshKeyboardControllerProxy(); | 453 return new AshKeyboardControllerProxy(); |
| 454 } | 454 } |
| OLD | NEW |