| 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 | 354 |
| 355 virtual void ToggleBluetoothConnection(const std::string& address) OVERRIDE { | 355 virtual void ToggleBluetoothConnection(const std::string& address) OVERRIDE { |
| 356 } | 356 } |
| 357 | 357 |
| 358 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE { | 358 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE { |
| 359 } | 359 } |
| 360 | 360 |
| 361 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE { | 361 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE { |
| 362 } | 362 } |
| 363 | 363 |
| 364 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE { |
| 365 } |
| 366 |
| 364 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { | 367 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { |
| 365 } | 368 } |
| 366 | 369 |
| 370 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { |
| 371 } |
| 372 |
| 367 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, | 373 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, |
| 368 bool large) OVERRIDE { | 374 bool large) OVERRIDE { |
| 369 } | 375 } |
| 370 | 376 |
| 371 virtual void GetAvailableNetworks( | 377 virtual void GetAvailableNetworks( |
| 372 std::vector<NetworkIconInfo>* list) OVERRIDE { | 378 std::vector<NetworkIconInfo>* list) OVERRIDE { |
| 373 } | 379 } |
| 374 | 380 |
| 375 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { | 381 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { |
| 376 } | 382 } |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 849 desktop_background_controller_->SetDesktopBackgroundImageMode( | 855 desktop_background_controller_->SetDesktopBackgroundImageMode( |
| 850 GetWallpaper(user_wallpaper_delegate_->GetUserWallpaperIndex())); | 856 GetWallpaper(user_wallpaper_delegate_->GetUserWallpaperIndex())); |
| 851 } | 857 } |
| 852 | 858 |
| 853 void Shell::DisableWorkspaceGridLayout() { | 859 void Shell::DisableWorkspaceGridLayout() { |
| 854 if (workspace_controller_.get()) | 860 if (workspace_controller_.get()) |
| 855 workspace_controller_->workspace_manager()->set_grid_size(0); | 861 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 856 } | 862 } |
| 857 | 863 |
| 858 } // namespace ash | 864 } // namespace ash |
| OLD | NEW |