OLD | NEW |
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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 : muted_(false), | 220 : muted_(false), |
221 volume_(0.5) { | 221 volume_(0.5) { |
222 } | 222 } |
223 | 223 |
224 virtual ~DummySystemTrayDelegate() {} | 224 virtual ~DummySystemTrayDelegate() {} |
225 | 225 |
226 private: | 226 private: |
227 | 227 |
228 // Overridden from SystemTrayDelegate: | 228 // Overridden from SystemTrayDelegate: |
229 virtual const std::string GetUserDisplayName() const OVERRIDE { | 229 virtual const std::string GetUserDisplayName() const OVERRIDE { |
230 return "chronos"; | 230 return "Über tray"; |
231 } | 231 } |
232 | 232 |
233 virtual const std::string GetUserEmail() const OVERRIDE { | 233 virtual const std::string GetUserEmail() const OVERRIDE { |
234 return "chr@nos"; | 234 return "über@tray"; |
235 } | 235 } |
236 | 236 |
237 virtual const SkBitmap& GetUserImage() const OVERRIDE { | 237 virtual const SkBitmap& GetUserImage() const OVERRIDE { |
238 return null_image_; | 238 return null_image_; |
239 } | 239 } |
240 | 240 |
241 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE { | 241 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE { |
242 return user::LOGGED_IN_USER; | 242 return user::LOGGED_IN_USER; |
243 } | 243 } |
244 | 244 |
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
685 // Create the desktop background image. | 685 // Create the desktop background image. |
686 SetDesktopBackgroundMode(BACKGROUND_IMAGE); | 686 SetDesktopBackgroundMode(BACKGROUND_IMAGE); |
687 } | 687 } |
688 | 688 |
689 void Shell::DisableWorkspaceGridLayout() { | 689 void Shell::DisableWorkspaceGridLayout() { |
690 if (workspace_controller_.get()) | 690 if (workspace_controller_.get()) |
691 workspace_controller_->workspace_manager()->set_grid_size(0); | 691 workspace_controller_->workspace_manager()->set_grid_size(0); |
692 } | 692 } |
693 | 693 |
694 } // namespace ash | 694 } // namespace ash |
OLD | NEW |