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/shell_window.h" | 7 #include "apps/shell_window.h" |
8 #include "apps/shell_window_registry.h" | 8 #include "apps/shell_window_registry.h" |
9 #include "ash/host/root_window_host_factory.h" | 9 #include "ash/host/root_window_host_factory.h" |
10 #include "ash/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
(...skipping 11 matching lines...) Expand all Loading... | |
22 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 22 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
23 #include "chrome/browser/ui/ash/user_action_handler.h" | 23 #include "chrome/browser/ui/ash/user_action_handler.h" |
24 #include "chrome/browser/ui/browser_commands.h" | 24 #include "chrome/browser/ui/browser_commands.h" |
25 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
26 #include "grit/chromium_strings.h" | 26 #include "grit/chromium_strings.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
29 | 29 |
30 #if defined(OS_CHROMEOS) | 30 #if defined(OS_CHROMEOS) |
31 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 31 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
32 #include "chrome/browser/chromeos/display/display_configuration_observer.h" | |
Jun Mukai
2014/01/13 23:51:15
do we need this line?
oshima
2014/01/13 23:58:19
This is necessary to delete DisplayCOnfigurationOb
| |
32 #include "chrome/browser/chromeos/login/user_manager.h" | 33 #include "chrome/browser/chromeos/login/user_manager.h" |
33 #endif | 34 #endif |
34 | 35 |
35 // static | 36 // static |
36 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; | 37 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; |
37 | 38 |
38 ChromeShellDelegate::ChromeShellDelegate() | 39 ChromeShellDelegate::ChromeShellDelegate() |
39 : shelf_delegate_(NULL) { | 40 : shelf_delegate_(NULL) { |
40 instance_ = this; | 41 instance_ = this; |
41 PlatformInit(); | 42 PlatformInit(); |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
147 } | 148 } |
148 | 149 |
149 base::string16 ChromeShellDelegate::GetProductName() const { | 150 base::string16 ChromeShellDelegate::GetProductName() const { |
150 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 151 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
151 } | 152 } |
152 | 153 |
153 keyboard::KeyboardControllerProxy* | 154 keyboard::KeyboardControllerProxy* |
154 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 155 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
155 return new AshKeyboardControllerProxy(); | 156 return new AshKeyboardControllerProxy(); |
156 } | 157 } |
OLD | NEW |