| 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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 | 376 |
| 377 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE { | 377 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE { |
| 378 } | 378 } |
| 379 | 379 |
| 380 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE { | 380 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE { |
| 381 } | 381 } |
| 382 | 382 |
| 383 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { | 383 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { |
| 384 } | 384 } |
| 385 | 385 |
| 386 virtual void ActivateIMEProperty(const std::string& key, | 386 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { |
| 387 bool is_selection) OVERRIDE { | |
| 388 } | 387 } |
| 389 | 388 |
| 390 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, | 389 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, |
| 391 bool large) OVERRIDE { | 390 bool large) OVERRIDE { |
| 392 } | 391 } |
| 393 | 392 |
| 394 virtual void GetAvailableNetworks( | 393 virtual void GetAvailableNetworks( |
| 395 std::vector<NetworkIconInfo>* list) OVERRIDE { | 394 std::vector<NetworkIconInfo>* list) OVERRIDE { |
| 396 } | 395 } |
| 397 | 396 |
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 // Create desktop background widget. | 935 // Create desktop background widget. |
| 937 desktop_background_controller_->SetDesktopBackgroundImageMode(); | 936 desktop_background_controller_->SetDesktopBackgroundImageMode(); |
| 938 } | 937 } |
| 939 | 938 |
| 940 void Shell::DisableWorkspaceGridLayout() { | 939 void Shell::DisableWorkspaceGridLayout() { |
| 941 if (workspace_controller_.get()) | 940 if (workspace_controller_.get()) |
| 942 workspace_controller_->workspace_manager()->set_grid_size(0); | 941 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 943 } | 942 } |
| 944 | 943 |
| 945 } // namespace ash | 944 } // namespace ash |
| OLD | NEW |