| 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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 | 451 |
| 452 virtual bool GetBluetoothEnabled() OVERRIDE { | 452 virtual bool GetBluetoothEnabled() OVERRIDE { |
| 453 return bluetooth_enabled_; | 453 return bluetooth_enabled_; |
| 454 } | 454 } |
| 455 | 455 |
| 456 virtual bool GetCellularScanSupported() OVERRIDE { | 456 virtual bool GetCellularScanSupported() OVERRIDE { |
| 457 return true; | 457 return true; |
| 458 } | 458 } |
| 459 | 459 |
| 460 virtual bool GetCellularCarrierInfo(std::string* carrier_id, | 460 virtual bool GetCellularCarrierInfo(std::string* carrier_id, |
| 461 std::string* toup_url) OVERRIDE { | 461 std::string* topup_url, |
| 462 std::string* setup_url) OVERRIDE { |
| 462 return false; | 463 return false; |
| 463 } | 464 } |
| 464 | 465 |
| 465 virtual void ShowCellularTopupURL(const std::string& topup_url) OVERRIDE { | 466 virtual void ShowCellularURL(const std::string& url) OVERRIDE { |
| 466 } | 467 } |
| 467 | 468 |
| 468 virtual void ChangeProxySettings() OVERRIDE { | 469 virtual void ChangeProxySettings() OVERRIDE { |
| 469 } | 470 } |
| 470 | 471 |
| 471 bool muted_; | 472 bool muted_; |
| 472 bool wifi_enabled_; | 473 bool wifi_enabled_; |
| 473 bool cellular_enabled_; | 474 bool cellular_enabled_; |
| 474 bool bluetooth_enabled_; | 475 bool bluetooth_enabled_; |
| 475 float volume_; | 476 float volume_; |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 902 panel_container->SetLayoutManager(panel_layout_manager_); | 903 panel_container->SetLayoutManager(panel_layout_manager_); |
| 903 } | 904 } |
| 904 } | 905 } |
| 905 | 906 |
| 906 void Shell::DisableWorkspaceGridLayout() { | 907 void Shell::DisableWorkspaceGridLayout() { |
| 907 if (workspace_controller_.get()) | 908 if (workspace_controller_.get()) |
| 908 workspace_controller_->workspace_manager()->set_grid_size(0); | 909 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 909 } | 910 } |
| 910 | 911 |
| 911 } // namespace ash | 912 } // namespace ash |
| OLD | NEW |