| 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 129 |
| 130 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) { | 130 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) { |
| 131 DCHECK(shelf_delegate_); | 131 DCHECK(shelf_delegate_); |
| 132 // Don't show context menu for exclusive app runtime mode. | 132 // Don't show context menu for exclusive app runtime mode. |
| 133 if (chrome::IsRunningInAppMode()) | 133 if (chrome::IsRunningInAppMode()) |
| 134 return NULL; | 134 return NULL; |
| 135 | 135 |
| 136 return new LauncherContextMenu(shelf_delegate_, root); | 136 return new LauncherContextMenu(shelf_delegate_, root); |
| 137 } | 137 } |
| 138 | 138 |
| 139 ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() { | 139 ash::WindowTreeHostFactory* ChromeShellDelegate::CreateWindowTreeHostFactory() { |
| 140 return ash::RootWindowHostFactory::Create(); | 140 return ash::WindowTreeHostFactory::Create(); |
| 141 } | 141 } |
| 142 | 142 |
| 143 base::string16 ChromeShellDelegate::GetProductName() const { | 143 base::string16 ChromeShellDelegate::GetProductName() const { |
| 144 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 144 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 145 } | 145 } |
| 146 | 146 |
| 147 keyboard::KeyboardControllerProxy* | 147 keyboard::KeyboardControllerProxy* |
| 148 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 148 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 149 return new AshKeyboardControllerProxy(); | 149 return new AshKeyboardControllerProxy(); |
| 150 } | 150 } |
| OLD | NEW |