| 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 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 | 301 |
| 302 virtual void ShowDateSettings() OVERRIDE { | 302 virtual void ShowDateSettings() OVERRIDE { |
| 303 } | 303 } |
| 304 | 304 |
| 305 virtual void ShowNetworkSettings() OVERRIDE { | 305 virtual void ShowNetworkSettings() OVERRIDE { |
| 306 } | 306 } |
| 307 | 307 |
| 308 virtual void ShowBluetoothSettings() OVERRIDE { | 308 virtual void ShowBluetoothSettings() OVERRIDE { |
| 309 } | 309 } |
| 310 | 310 |
| 311 virtual void ShowDriveSettings() OVERRIDE { |
| 312 } |
| 313 |
| 311 virtual void ShowIMESettings() OVERRIDE { | 314 virtual void ShowIMESettings() OVERRIDE { |
| 312 } | 315 } |
| 313 | 316 |
| 314 virtual void ShowHelp() OVERRIDE { | 317 virtual void ShowHelp() OVERRIDE { |
| 315 } | 318 } |
| 316 | 319 |
| 317 virtual bool IsAudioMuted() const OVERRIDE { | 320 virtual bool IsAudioMuted() const OVERRIDE { |
| 318 return muted_; | 321 return muted_; |
| 319 } | 322 } |
| 320 | 323 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 | 370 |
| 368 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE { | 371 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE { |
| 369 } | 372 } |
| 370 | 373 |
| 371 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { | 374 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { |
| 372 } | 375 } |
| 373 | 376 |
| 374 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { | 377 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { |
| 375 } | 378 } |
| 376 | 379 |
| 380 virtual void CancelDriveOperation(const FilePath&) OVERRIDE { |
| 381 } |
| 382 |
| 383 virtual void GetDriveOperationStatusList( |
| 384 ash::DriveOperationStatusList*) OVERRIDE { |
| 385 } |
| 386 |
| 377 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, | 387 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, |
| 378 bool large) OVERRIDE { | 388 bool large) OVERRIDE { |
| 379 } | 389 } |
| 380 | 390 |
| 381 virtual void GetAvailableNetworks( | 391 virtual void GetAvailableNetworks( |
| 382 std::vector<NetworkIconInfo>* list) OVERRIDE { | 392 std::vector<NetworkIconInfo>* list) OVERRIDE { |
| 383 } | 393 } |
| 384 | 394 |
| 385 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { | 395 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { |
| 386 } | 396 } |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 914 panel_container->SetLayoutManager(panel_layout_manager_); | 924 panel_container->SetLayoutManager(panel_layout_manager_); |
| 915 } | 925 } |
| 916 } | 926 } |
| 917 | 927 |
| 918 void Shell::DisableWorkspaceGridLayout() { | 928 void Shell::DisableWorkspaceGridLayout() { |
| 919 if (workspace_controller_.get()) | 929 if (workspace_controller_.get()) |
| 920 workspace_controller_->workspace_manager()->set_grid_size(0); | 930 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 921 } | 931 } |
| 922 | 932 |
| 923 } // namespace ash | 933 } // namespace ash |
| OLD | NEW |