| 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/app_window.h" | 7 #include "apps/app_window.h" |
| 8 #include "apps/app_window_registry.h" | 8 #include "apps/app_window_registry.h" |
| 9 #include "ash/content_support/gpu_support_impl.h" | 9 #include "ash/content_support/gpu_support_impl.h" |
| 10 #include "ash/host/window_tree_host_factory.h" | 10 #include "ash/host/window_tree_host_factory.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 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" | 32 #include "chrome/browser/chromeos/display/display_configuration_observer.h" |
| 33 #include "chrome/browser/chromeos/login/user_manager.h" | 33 #include "chrome/browser/chromeos/login/user_manager.h" |
| 34 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
| 34 #endif | 35 #endif |
| 35 | 36 |
| 36 // static | 37 // static |
| 37 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; | 38 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; |
| 38 | 39 |
| 39 ChromeShellDelegate::ChromeShellDelegate() | 40 ChromeShellDelegate::ChromeShellDelegate() |
| 40 : shelf_delegate_(NULL) { | 41 : shelf_delegate_(NULL) { |
| 41 instance_ = this; | 42 instance_ = this; |
| 42 PlatformInit(); | 43 PlatformInit(); |
| 43 } | 44 } |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 } | 147 } |
| 147 | 148 |
| 148 base::string16 ChromeShellDelegate::GetProductName() const { | 149 base::string16 ChromeShellDelegate::GetProductName() const { |
| 149 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 150 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 150 } | 151 } |
| 151 | 152 |
| 152 keyboard::KeyboardControllerProxy* | 153 keyboard::KeyboardControllerProxy* |
| 153 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 154 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 154 return new AshKeyboardControllerProxy(); | 155 return new AshKeyboardControllerProxy(); |
| 155 } | 156 } |
| 157 |
| 158 bool ChromeShellDelegate::ShouldUseCustomizedDefaultWallpaper() const { |
| 159 #if defined(OS_CHROMEOS) |
| 160 return chromeos::WallpaperManager::ShouldUseCustomizedDefaultWallpaper(); |
| 161 #else |
| 162 return false; |
| 163 #endif |
| 164 } |
| 165 |
| 166 base::FilePath |
| 167 ChromeShellDelegate::GetCustomizedWallpaperDefaultRescaledSmallFileName() |
| 168 const { |
| 169 #if defined(OS_CHROMEOS) |
| 170 return chromeos::WallpaperManager:: |
| 171 GetCustomizedWallpaperDefaultRescaledSmallFileName(); |
| 172 #else |
| 173 return base::FilePath(); |
| 174 #endif |
| 175 } |
| 176 |
| 177 base::FilePath |
| 178 ChromeShellDelegate::GetCustomizedWallpaperDefaultRescaledLargeFileName() |
| 179 const { |
| 180 #if defined(OS_CHROMEOS) |
| 181 return chromeos::WallpaperManager:: |
| 182 GetCustomizedWallpaperDefaultRescaledLargeFileName(); |
| 183 #else |
| 184 return base::FilePath(); |
| 185 #endif |
| 186 } |
| OLD | NEW |