| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE { | 237 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE { |
| 238 return user::LOGGED_IN_USER; | 238 return user::LOGGED_IN_USER; |
| 239 } | 239 } |
| 240 | 240 |
| 241 virtual void ShowSettings() OVERRIDE { | 241 virtual void ShowSettings() OVERRIDE { |
| 242 } | 242 } |
| 243 | 243 |
| 244 virtual void ShowDateSettings() OVERRIDE { | 244 virtual void ShowDateSettings() OVERRIDE { |
| 245 } | 245 } |
| 246 | 246 |
| 247 virtual void ShowNetworkSettings() OVERRIDE { |
| 248 } |
| 249 |
| 247 virtual void ShowHelp() OVERRIDE { | 250 virtual void ShowHelp() OVERRIDE { |
| 248 } | 251 } |
| 249 | 252 |
| 250 virtual bool IsAudioMuted() const OVERRIDE { | 253 virtual bool IsAudioMuted() const OVERRIDE { |
| 251 return muted_; | 254 return muted_; |
| 252 } | 255 } |
| 253 | 256 |
| 254 virtual void SetAudioMuted(bool muted) OVERRIDE { | 257 virtual void SetAudioMuted(bool muted) OVERRIDE { |
| 255 muted_ = muted; | 258 muted_ = muted; |
| 256 } | 259 } |
| 257 | 260 |
| 258 virtual float GetVolumeLevel() const OVERRIDE { | 261 virtual float GetVolumeLevel() const OVERRIDE { |
| 259 return volume_; | 262 return volume_; |
| 260 } | 263 } |
| 261 | 264 |
| 262 virtual void SetVolumeLevel(float volume) OVERRIDE { | 265 virtual void SetVolumeLevel(float volume) OVERRIDE { |
| 263 volume_ = volume; | 266 volume_ = volume; |
| 264 } | 267 } |
| 265 | 268 |
| 266 virtual void ShutDown() OVERRIDE {} | 269 virtual void ShutDown() OVERRIDE {} |
| 267 virtual void SignOut() OVERRIDE {} | 270 virtual void SignOut() OVERRIDE {} |
| 268 virtual void RequestLockScreen() OVERRIDE {} | 271 virtual void RequestLockScreen() OVERRIDE {} |
| 269 virtual NetworkIconInfo GetMostRelevantNetworkIcon() { | 272 virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE { |
| 270 return NetworkIconInfo(); | 273 return NetworkIconInfo(); |
| 271 } | 274 } |
| 275 virtual void GetAvailableNetworks( |
| 276 std::vector<NetworkIconInfo>* list) OVERRIDE { |
| 277 } |
| 278 |
| 279 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { |
| 280 } |
| 281 |
| 282 virtual void ToggleAirplaneMode() OVERRIDE { |
| 283 } |
| 284 |
| 285 virtual void ChangeProxySettings() OVERRIDE { |
| 286 } |
| 272 | 287 |
| 273 bool muted_; | 288 bool muted_; |
| 274 float volume_; | 289 float volume_; |
| 275 SkBitmap null_image_; | 290 SkBitmap null_image_; |
| 276 | 291 |
| 277 DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate); | 292 DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate); |
| 278 }; | 293 }; |
| 279 | 294 |
| 280 } // namespace | 295 } // namespace |
| 281 | 296 |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 // Create the desktop background image. | 643 // Create the desktop background image. |
| 629 SetDesktopBackgroundMode(BACKGROUND_IMAGE); | 644 SetDesktopBackgroundMode(BACKGROUND_IMAGE); |
| 630 } | 645 } |
| 631 | 646 |
| 632 void Shell::DisableWorkspaceGridLayout() { | 647 void Shell::DisableWorkspaceGridLayout() { |
| 633 if (workspace_controller_.get()) | 648 if (workspace_controller_.get()) |
| 634 workspace_controller_->workspace_manager()->set_grid_size(0); | 649 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 635 } | 650 } |
| 636 | 651 |
| 637 } // namespace ash | 652 } // namespace ash |
| OLD | NEW |