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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 11087009: Merge 159822 - ash: Display system background while loading wallpaper. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 years, 2 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
« no previous file with comments | « ash/wm/workspace/workspace_manager2.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
7 7
8 #include "ash/launcher/launcher_types.h" 8 #include "ash/launcher/launcher_types.h"
9 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 18 matching lines...) Expand all
29 29
30 static ChromeShellDelegate* instance() { return instance_; } 30 static ChromeShellDelegate* instance() { return instance_; }
31 31
32 ash::WindowPositioner* window_positioner() { 32 ash::WindowPositioner* window_positioner() {
33 return window_positioner_.get(); 33 return window_positioner_.get();
34 } 34 }
35 35
36 // ash::ShellDelegate overrides; 36 // ash::ShellDelegate overrides;
37 virtual bool IsUserLoggedIn() OVERRIDE; 37 virtual bool IsUserLoggedIn() OVERRIDE;
38 virtual bool IsSessionStarted() OVERRIDE; 38 virtual bool IsSessionStarted() OVERRIDE;
39 virtual bool IsFirstRunAfterBoot() OVERRIDE;
39 virtual void LockScreen() OVERRIDE; 40 virtual void LockScreen() OVERRIDE;
40 virtual void UnlockScreen() OVERRIDE; 41 virtual void UnlockScreen() OVERRIDE;
41 virtual bool IsScreenLocked() const OVERRIDE; 42 virtual bool IsScreenLocked() const OVERRIDE;
42 virtual void Shutdown() OVERRIDE; 43 virtual void Shutdown() OVERRIDE;
43 virtual void Exit() OVERRIDE; 44 virtual void Exit() OVERRIDE;
44 virtual void NewTab() OVERRIDE; 45 virtual void NewTab() OVERRIDE;
45 virtual void NewWindow(bool is_incognito) OVERRIDE; 46 virtual void NewWindow(bool is_incognito) OVERRIDE;
46 virtual void OpenFileManager(bool as_dialog) OVERRIDE; 47 virtual void OpenFileManager(bool as_dialog) OVERRIDE;
47 virtual void OpenCrosh() OVERRIDE; 48 virtual void OpenCrosh() OVERRIDE;
48 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE; 49 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
(...skipping 30 matching lines...) Expand all
79 content::NotificationRegistrar registrar_; 80 content::NotificationRegistrar registrar_;
80 81
81 scoped_ptr<ash::WindowPositioner> window_positioner_; 82 scoped_ptr<ash::WindowPositioner> window_positioner_;
82 83
83 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_; 84 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;
84 85
85 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 86 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
86 }; 87 };
87 88
88 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 89 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_manager2.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698