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

Side by Side Diff: ash/system/tray/default_system_tray_delegate.h

Issue 210903003: Implemented system tray UI for new account management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflicts resolved. Created 6 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
« no previous file with comments | « ash/system/ime/tray_ime.cc ('k') | ash/system/tray/default_system_tray_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE; 87 scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE;
88 virtual bool GetSessionStartTime( 88 virtual bool GetSessionStartTime(
89 base::TimeTicks* session_start_time) OVERRIDE; 89 base::TimeTicks* session_start_time) OVERRIDE;
90 virtual bool GetSessionLengthLimit( 90 virtual bool GetSessionLengthLimit(
91 base::TimeDelta* session_length_limit) OVERRIDE; 91 base::TimeDelta* session_length_limit) OVERRIDE;
92 virtual int GetSystemTrayMenuWidth() OVERRIDE; 92 virtual int GetSystemTrayMenuWidth() OVERRIDE;
93 virtual void ActiveUserWasChanged() OVERRIDE; 93 virtual void ActiveUserWasChanged() OVERRIDE;
94 virtual bool IsNetworkBehindCaptivePortal( 94 virtual bool IsNetworkBehindCaptivePortal(
95 const std::string& service_path) const OVERRIDE; 95 const std::string& service_path) const OVERRIDE;
96 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE; 96 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE;
97 virtual tray::UserAccountsDelegate* GetUserAccountsDelegate(
98 const std::string& user_id) OVERRIDE;
97 99
98 private: 100 private:
99 bool bluetooth_enabled_; 101 bool bluetooth_enabled_;
100 scoped_ptr<VolumeControlDelegate> volume_control_delegate_; 102 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;
101 103
102 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate); 104 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);
103 }; 105 };
104 106
105 } // namespace ash 107 } // namespace ash
106 108
107 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 109 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/ime/tray_ime.cc ('k') | ash/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698