Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 9764012: Restore to user selected wallpaper after browser crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review and fix a segfault when starting chrome after saving data to local state. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/views/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/wm/partial_screenshot_view.h" 9 #include "ash/wm/partial_screenshot_view.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_list.h" 13 #include "chrome/browser/ui/browser_list.h"
14 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h" 14 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h"
15 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" 15 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
16 #include "chrome/browser/ui/views/ash/status_area_host_aura.h" 16 #include "chrome/browser/ui/views/ash/status_area_host_aura.h"
17 #include "chrome/browser/ui/views/frame/browser_view.h" 17 #include "chrome/browser/ui/views/frame/browser_view.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 20
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 #include "chrome/browser/chromeos/background/desktop_background_observer.h"
22 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 23 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
23 #include "chrome/browser/chromeos/dbus/power_manager_client.h" 24 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
24 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 25 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
25 #endif 26 #endif
26 namespace { 27 namespace {
27 28
28 // Returns a list of Aura windows from a BrowserList, using either a 29 // Returns a list of Aura windows from a BrowserList, using either a
29 // const_iterator or const_reverse_iterator. 30 // const_iterator or const_reverse_iterator.
30 template<typename IT> 31 template<typename IT>
31 std::vector<aura::Window*> GetBrowserWindows(IT begin, IT end) { 32 std::vector<aura::Window*> GetBrowserWindows(IT begin, IT end) {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 } 103 }
103 104
104 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate( 105 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate(
105 ash::SystemTray* tray) { 106 ash::SystemTray* tray) {
106 #if defined(OS_CHROMEOS) 107 #if defined(OS_CHROMEOS)
107 return chromeos::CreateSystemTrayDelegate(tray); 108 return chromeos::CreateSystemTrayDelegate(tray);
108 #else 109 #else
109 return NULL; 110 return NULL;
110 #endif 111 #endif
111 } 112 }
113
114 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
115 #if defined(OS_CHROMEOS)
116 return chromeos::CreateUserWallpaperDelegate();
117 #else
118 return NULL;
119 #endif
120 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698