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