Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Side by Side Diff: ash/shell.cc

Issue 10201015: [cros] Add network tray item for mobile network setup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: refactor Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 464
465 virtual bool GetBluetoothEnabled() OVERRIDE { 465 virtual bool GetBluetoothEnabled() OVERRIDE {
466 return bluetooth_enabled_; 466 return bluetooth_enabled_;
467 } 467 }
468 468
469 virtual bool GetCellularScanSupported() OVERRIDE { 469 virtual bool GetCellularScanSupported() OVERRIDE {
470 return true; 470 return true;
471 } 471 }
472 472
473 virtual bool GetCellularCarrierInfo(std::string* carrier_id, 473 virtual bool GetCellularCarrierInfo(std::string* carrier_id,
474 std::string* toup_url) OVERRIDE { 474 std::string* topup_url,
475 std::string* setup_url) OVERRIDE {
475 return false; 476 return false;
476 } 477 }
477 478
478 virtual void ShowCellularTopupURL(const std::string& topup_url) OVERRIDE { 479 virtual void ShowCellularURL(const std::string& url) OVERRIDE {
479 } 480 }
480 481
481 virtual void ChangeProxySettings() OVERRIDE { 482 virtual void ChangeProxySettings() OVERRIDE {
482 } 483 }
483 484
484 bool muted_; 485 bool muted_;
485 bool wifi_enabled_; 486 bool wifi_enabled_;
486 bool cellular_enabled_; 487 bool cellular_enabled_;
487 bool bluetooth_enabled_; 488 bool bluetooth_enabled_;
488 float volume_; 489 float volume_;
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 panel_container->SetLayoutManager(panel_layout_manager_); 959 panel_container->SetLayoutManager(panel_layout_manager_);
959 } 960 }
960 } 961 }
961 962
962 void Shell::DisableWorkspaceGridLayout() { 963 void Shell::DisableWorkspaceGridLayout() {
963 if (workspace_controller_.get()) 964 if (workspace_controller_.get())
964 workspace_controller_->workspace_manager()->set_grid_size(0); 965 workspace_controller_->workspace_manager()->set_grid_size(0);
965 } 966 }
966 967
967 } // namespace ash 968 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698