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

Side by Side Diff: ash/shell/shell_main.cc

Issue 9764012: Restore to user selected wallpaper after browser crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 <map> 5 #include <map>
6 6
7 #include "ash/launcher/launcher.h" 7 #include "ash/launcher/launcher.h"
8 #include "ash/launcher/launcher_delegate.h" 8 #include "ash/launcher/launcher_delegate.h"
9 #include "ash/launcher/launcher_model.h" 9 #include "ash/launcher/launcher_model.h"
10 #include "ash/launcher/launcher_types.h" 10 #include "ash/launcher/launcher_types.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 ash::LauncherModel* model) OVERRIDE { 223 ash::LauncherModel* model) OVERRIDE {
224 launcher_delegate_ = new LauncherDelegateImpl(watcher_); 224 launcher_delegate_ = new LauncherDelegateImpl(watcher_);
225 return launcher_delegate_; 225 return launcher_delegate_;
226 } 226 }
227 227
228 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate( 228 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
229 ash::SystemTray* tray) { 229 ash::SystemTray* tray) {
230 return NULL; 230 return NULL;
231 } 231 }
232 232
233 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
234 return NULL;
235 }
236
233 private: 237 private:
234 // Used to update Launcher. Owned by main. 238 // Used to update Launcher. Owned by main.
235 WindowWatcher* watcher_; 239 WindowWatcher* watcher_;
236 240
237 LauncherDelegateImpl* launcher_delegate_; 241 LauncherDelegateImpl* launcher_delegate_;
238 242
239 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 243 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
240 }; 244 };
241 245
242 } // namespace 246 } // namespace
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 window_watcher.reset(); 283 window_watcher.reset();
280 284
281 ash::Shell::DeleteInstance(); 285 ash::Shell::DeleteInstance();
282 286
283 aura::Env::DeleteInstance(); 287 aura::Env::DeleteInstance();
284 288
285 ui::CompositorTestSupport::Terminate(); 289 ui::CompositorTestSupport::Terminate();
286 290
287 return 0; 291 return 0;
288 } 292 }
OLDNEW
« ash/shell.cc ('K') | « ash/shell.cc ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698