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

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

Issue 14200034: Revert 194578 "Add ash SessionStateDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 #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 <string> 8 #include <string>
9 9
10 #include "ash/launcher/launcher_types.h" 10 #include "ash/launcher/launcher_types.h"
(...skipping 29 matching lines...) Expand all
40 static ChromeShellDelegate* instance() { return instance_; } 40 static ChromeShellDelegate* instance() { return instance_; }
41 41
42 // Prefer the version in ImmersiveModeController. 42 // Prefer the version in ImmersiveModeController.
43 static bool UseImmersiveFullscreen(); 43 static bool UseImmersiveFullscreen();
44 44
45 ash::WindowPositioner* window_positioner() { 45 ash::WindowPositioner* window_positioner() {
46 return window_positioner_.get(); 46 return window_positioner_.get();
47 } 47 }
48 48
49 // ash::ShellDelegate overrides; 49 // ash::ShellDelegate overrides;
50 virtual bool IsUserLoggedIn() const OVERRIDE;
51 virtual bool IsSessionStarted() const OVERRIDE;
52 virtual bool IsGuestSession() const OVERRIDE;
50 virtual bool IsFirstRunAfterBoot() const OVERRIDE; 53 virtual bool IsFirstRunAfterBoot() const OVERRIDE;
51 virtual bool IsMultiProfilesEnabled() const OVERRIDE; 54 virtual bool IsMultiProfilesEnabled() const OVERRIDE;
52 virtual bool IsRunningInForcedAppMode() const OVERRIDE; 55 virtual bool IsRunningInForcedAppMode() const OVERRIDE;
56 virtual bool CanLockScreen() const OVERRIDE;
57 virtual void LockScreen() OVERRIDE;
58 virtual void UnlockScreen() OVERRIDE;
59 virtual bool IsScreenLocked() const OVERRIDE;
53 virtual void PreInit() OVERRIDE; 60 virtual void PreInit() OVERRIDE;
54 virtual void Shutdown() OVERRIDE; 61 virtual void Shutdown() OVERRIDE;
55 virtual void Exit() OVERRIDE; 62 virtual void Exit() OVERRIDE;
56 virtual void NewTab() OVERRIDE; 63 virtual void NewTab() OVERRIDE;
57 virtual void NewWindow(bool is_incognito) OVERRIDE; 64 virtual void NewWindow(bool is_incognito) OVERRIDE;
58 virtual void ToggleMaximized() OVERRIDE; 65 virtual void ToggleMaximized() OVERRIDE;
59 virtual void OpenFileManager(bool as_dialog) OVERRIDE; 66 virtual void OpenFileManager(bool as_dialog) OVERRIDE;
60 virtual void OpenCrosh() OVERRIDE; 67 virtual void OpenCrosh() OVERRIDE;
61 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE; 68 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
62 virtual void RestoreTab() OVERRIDE; 69 virtual void RestoreTab() OVERRIDE;
(...skipping 12 matching lines...) Expand all
75 virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE; 82 virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE;
76 virtual bool IsMagnifierEnabled() const OVERRIDE; 83 virtual bool IsMagnifierEnabled() const OVERRIDE;
77 virtual ash::MagnifierType GetMagnifierType() const OVERRIDE; 84 virtual ash::MagnifierType GetMagnifierType() const OVERRIDE;
78 virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE; 85 virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE;
79 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 86 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
80 virtual ash::LauncherDelegate* CreateLauncherDelegate( 87 virtual ash::LauncherDelegate* CreateLauncherDelegate(
81 ash::LauncherModel* model) OVERRIDE; 88 ash::LauncherModel* model) OVERRIDE;
82 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 89 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
83 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 90 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
84 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 91 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
85 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
86 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 92 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
87 virtual void OpenFeedbackPage() OVERRIDE; 93 virtual void OpenFeedbackPage() OVERRIDE;
88 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE; 94 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;
89 virtual void HandleMediaNextTrack() OVERRIDE; 95 virtual void HandleMediaNextTrack() OVERRIDE;
90 virtual void HandleMediaPlayPause() OVERRIDE; 96 virtual void HandleMediaPlayPause() OVERRIDE;
91 virtual void HandleMediaPrevTrack() OVERRIDE; 97 virtual void HandleMediaPrevTrack() OVERRIDE;
92 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE; 98 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
93 virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE; 99 virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE;
94 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE; 100 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
95 virtual double GetSavedScreenMagnifierScale() OVERRIDE; 101 virtual double GetSavedScreenMagnifierScale() OVERRIDE;
(...skipping 20 matching lines...) Expand all
116 scoped_ptr<ash::WindowPositioner> window_positioner_; 122 scoped_ptr<ash::WindowPositioner> window_positioner_;
117 123
118 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_; 124 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;
119 125
120 ChromeLauncherController* launcher_delegate_; 126 ChromeLauncherController* launcher_delegate_;
121 127
122 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 128 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
123 }; 129 };
124 130
125 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 131 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/idle_chromeos.cc ('k') | trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698