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

Side by Side Diff: ash/shell.cc

Issue 9584034: ash: Constantify user methods of SystemTrayDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase ... 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
« no previous file with comments | « no previous file | ash/system/tray/system_tray_delegate.h » ('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 #include "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/app_list/app_list.h" 9 #include "ash/app_list/app_list.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 public: 185 public:
186 DummySystemTrayDelegate() 186 DummySystemTrayDelegate()
187 : muted_(false), 187 : muted_(false),
188 volume_(0.5) { 188 volume_(0.5) {
189 } 189 }
190 190
191 virtual ~DummySystemTrayDelegate() {} 191 virtual ~DummySystemTrayDelegate() {}
192 192
193 private: 193 private:
194 194
195 // SystemTrayDelegate implementation. 195 // Overridden from SystemTrayDelegate:
196 virtual const std::string GetUserDisplayName() OVERRIDE { 196 virtual const std::string GetUserDisplayName() const OVERRIDE {
197 return "chronos"; 197 return "chronos";
198 } 198 }
199 199
200 virtual const std::string GetUserEmail() OVERRIDE { 200 virtual const std::string GetUserEmail() const OVERRIDE {
201 return "chr@nos"; 201 return "chr@nos";
202 } 202 }
203 203
204 virtual const SkBitmap& GetUserImage() OVERRIDE { 204 virtual const SkBitmap& GetUserImage() const OVERRIDE {
205 return null_image_; 205 return null_image_;
206 } 206 }
207 207
208 virtual user::LoginStatus GetUserLoginStatus() OVERRIDE { 208 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE {
209 return user::LOGGED_IN_USER; 209 return user::LOGGED_IN_USER;
210 } 210 }
211 211
212 virtual void ShowSettings() OVERRIDE { 212 virtual void ShowSettings() OVERRIDE {
213 } 213 }
214 214
215 virtual void ShowHelp() OVERRIDE { 215 virtual void ShowHelp() OVERRIDE {
216 } 216 }
217 217
218 virtual bool IsAudioMuted() const OVERRIDE { 218 virtual bool IsAudioMuted() const OVERRIDE {
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 void Shell::ResetLayoutManager(int container_id) { 674 void Shell::ResetLayoutManager(int container_id) {
675 GetContainer(container_id)->SetLayoutManager(NULL); 675 GetContainer(container_id)->SetLayoutManager(NULL);
676 } 676 }
677 677
678 void Shell::DisableWorkspaceGridLayout() { 678 void Shell::DisableWorkspaceGridLayout() {
679 if (workspace_controller_.get()) 679 if (workspace_controller_.get())
680 workspace_controller_->workspace_manager()->set_grid_size(0); 680 workspace_controller_->workspace_manager()->set_grid_size(0);
681 } 681 }
682 682
683 } // namespace ash 683 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698