| 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 } | 299 } |
| 300 | 300 |
| 301 virtual base::HourClockType GetHourClockType() const OVERRIDE { | 301 virtual base::HourClockType GetHourClockType() const OVERRIDE { |
| 302 return base::k24HourClock; | 302 return base::k24HourClock; |
| 303 } | 303 } |
| 304 | 304 |
| 305 virtual PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE { | 305 virtual PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE { |
| 306 return PowerSupplyStatus(); | 306 return PowerSupplyStatus(); |
| 307 } | 307 } |
| 308 | 308 |
| 309 virtual void RequestStatusUpdate() const OVERRIDE { |
| 310 } |
| 311 |
| 309 virtual void ShowSettings() OVERRIDE { | 312 virtual void ShowSettings() OVERRIDE { |
| 310 } | 313 } |
| 311 | 314 |
| 312 virtual void ShowDateSettings() OVERRIDE { | 315 virtual void ShowDateSettings() OVERRIDE { |
| 313 } | 316 } |
| 314 | 317 |
| 315 virtual void ShowNetworkSettings() OVERRIDE { | 318 virtual void ShowNetworkSettings() OVERRIDE { |
| 316 } | 319 } |
| 317 | 320 |
| 318 virtual void ShowBluetoothSettings() OVERRIDE { | 321 virtual void ShowBluetoothSettings() OVERRIDE { |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 938 desktop_background_controller_->SetDesktopBackgroundImageMode( | 941 desktop_background_controller_->SetDesktopBackgroundImageMode( |
| 939 GetWallpaper(index), GetWallpaperInfo(index).layout); | 942 GetWallpaper(index), GetWallpaperInfo(index).layout); |
| 940 } | 943 } |
| 941 | 944 |
| 942 void Shell::DisableWorkspaceGridLayout() { | 945 void Shell::DisableWorkspaceGridLayout() { |
| 943 if (workspace_controller_.get()) | 946 if (workspace_controller_.get()) |
| 944 workspace_controller_->workspace_manager()->set_grid_size(0); | 947 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 945 } | 948 } |
| 946 | 949 |
| 947 } // namespace ash | 950 } // namespace ash |
| OLD | NEW |