| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 } | 294 } |
| 295 | 295 |
| 296 virtual int GetSystemUpdateIconResource() const OVERRIDE { | 296 virtual int GetSystemUpdateIconResource() const OVERRIDE { |
| 297 return IDR_AURA_UBER_TRAY_UPDATE; | 297 return IDR_AURA_UBER_TRAY_UPDATE; |
| 298 } | 298 } |
| 299 | 299 |
| 300 virtual base::HourClockType GetHourClockType() const OVERRIDE { | 300 virtual base::HourClockType GetHourClockType() const OVERRIDE { |
| 301 return base::k24HourClock; | 301 return base::k24HourClock; |
| 302 } | 302 } |
| 303 | 303 |
| 304 virtual PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE { | 304 virtual PowerSupplyStatus GetPowerSupplyStatus( |
| 305 UpdateRequestType request_type) const OVERRIDE { |
| 305 return PowerSupplyStatus(); | 306 return PowerSupplyStatus(); |
| 306 } | 307 } |
| 307 | 308 |
| 308 virtual void ShowSettings() OVERRIDE { | 309 virtual void ShowSettings() OVERRIDE { |
| 309 } | 310 } |
| 310 | 311 |
| 311 virtual void ShowDateSettings() OVERRIDE { | 312 virtual void ShowDateSettings() OVERRIDE { |
| 312 } | 313 } |
| 313 | 314 |
| 314 virtual void ShowNetworkSettings() OVERRIDE { | 315 virtual void ShowNetworkSettings() OVERRIDE { |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 desktop_background_controller_->SetDesktopBackgroundImageMode( | 922 desktop_background_controller_->SetDesktopBackgroundImageMode( |
| 922 GetWallpaper(index), GetWallpaperInfo(index).layout); | 923 GetWallpaper(index), GetWallpaperInfo(index).layout); |
| 923 } | 924 } |
| 924 | 925 |
| 925 void Shell::DisableWorkspaceGridLayout() { | 926 void Shell::DisableWorkspaceGridLayout() { |
| 926 if (workspace_controller_.get()) | 927 if (workspace_controller_.get()) |
| 927 workspace_controller_->workspace_manager()->set_grid_size(0); | 928 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 928 } | 929 } |
| 929 | 930 |
| 930 } // namespace ash | 931 } // namespace ash |
| OLD | NEW |