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

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

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_SESSION_STATE_DELEGATE_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_VIEWS_H_
6 #define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_VIEWS_H_ 6 #define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_VIEWS_H_
7 7
8 #include "ash/session/session_state_delegate.h" 8 #include "ash/session/session_state_delegate.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/observer_list.h" 11 #include "base/observer_list.h"
12 #include "ui/gfx/image/image_skia.h"
13 12
14 namespace ash { 13 namespace ash {
15 class SessionStateObserver; 14 class SessionStateObserver;
16 } // namespace ash 15 } // namespace ash
17 16
18 class SessionStateDelegate : public ash::SessionStateDelegate { 17 class SessionStateDelegate : public ash::SessionStateDelegate {
19 public: 18 public:
20 SessionStateDelegate(); 19 SessionStateDelegate();
21 virtual ~SessionStateDelegate(); 20 virtual ~SessionStateDelegate();
22 21
(...skipping 16 matching lines...) Expand all
39 ash::MultiProfileIndex index) const OVERRIDE; 38 ash::MultiProfileIndex index) const OVERRIDE;
40 virtual const ash::UserInfo* GetUserInfo( 39 virtual const ash::UserInfo* GetUserInfo(
41 content::BrowserContext* context) const OVERRIDE; 40 content::BrowserContext* context) const OVERRIDE;
42 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE; 41 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
43 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE; 42 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
44 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE; 43 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
45 virtual void AddSessionStateObserver( 44 virtual void AddSessionStateObserver(
46 ash::SessionStateObserver* observer) OVERRIDE; 45 ash::SessionStateObserver* observer) OVERRIDE;
47 virtual void RemoveSessionStateObserver( 46 virtual void RemoveSessionStateObserver(
48 ash::SessionStateObserver* observer) OVERRIDE; 47 ash::SessionStateObserver* observer) OVERRIDE;
49
50 private: 48 private:
51 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegate); 49 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegate);
52 }; 50 };
53 51
54 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_VIEWS_H_ 52 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_VIEWS_H_
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/ui/ash/screenshot_taker.cc ('k') | trunk/src/chrome/browser/ui/ash/session_state_delegate_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698