| 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 wifi_enabled_(true), | 236 wifi_enabled_(true), |
| 237 cellular_enabled_(true), | 237 cellular_enabled_(true), |
| 238 bluetooth_enabled_(true), | 238 bluetooth_enabled_(true), |
| 239 volume_(0.5) { | 239 volume_(0.5) { |
| 240 } | 240 } |
| 241 | 241 |
| 242 virtual ~DummySystemTrayDelegate() {} | 242 virtual ~DummySystemTrayDelegate() {} |
| 243 | 243 |
| 244 private: | 244 private: |
| 245 | 245 |
| 246 virtual bool GetTrayVisibilityOnStartup() OVERRIDE { return true; } |
| 247 |
| 246 // Overridden from SystemTrayDelegate: | 248 // Overridden from SystemTrayDelegate: |
| 247 virtual const std::string GetUserDisplayName() const OVERRIDE { | 249 virtual const std::string GetUserDisplayName() const OVERRIDE { |
| 248 return "Über tray Über tray Über tray Über tray"; | 250 return "Über tray Über tray Über tray Über tray"; |
| 249 } | 251 } |
| 250 | 252 |
| 251 virtual const std::string GetUserEmail() const OVERRIDE { | 253 virtual const std::string GetUserEmail() const OVERRIDE { |
| 252 return "über@tray"; | 254 return "über@tray"; |
| 253 } | 255 } |
| 254 | 256 |
| 255 virtual const SkBitmap& GetUserImage() const OVERRIDE { | 257 virtual const SkBitmap& GetUserImage() const OVERRIDE { |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 tray_->AddTrayItem(tray_power); | 627 tray_->AddTrayItem(tray_power); |
| 626 tray_->AddTrayItem(tray_network); | 628 tray_->AddTrayItem(tray_network); |
| 627 tray_->AddTrayItem(tray_bluetooth); | 629 tray_->AddTrayItem(tray_bluetooth); |
| 628 tray_->AddTrayItem(tray_ime); | 630 tray_->AddTrayItem(tray_ime); |
| 629 tray_->AddTrayItem(tray_volume); | 631 tray_->AddTrayItem(tray_volume); |
| 630 tray_->AddTrayItem(tray_brightness); | 632 tray_->AddTrayItem(tray_brightness); |
| 631 tray_->AddTrayItem(new internal::TraySettings()); | 633 tray_->AddTrayItem(new internal::TraySettings()); |
| 632 tray_->AddTrayItem(tray_date); | 634 tray_->AddTrayItem(tray_date); |
| 633 tray_->AddTrayItem(tray_accessibility); | 635 tray_->AddTrayItem(tray_accessibility); |
| 634 tray_->AddTrayItem(tray_caps_lock); | 636 tray_->AddTrayItem(tray_caps_lock); |
| 637 |
| 638 tray_->SetVisible(tray_delegate_->GetTrayVisibilityOnStartup()); |
| 635 } | 639 } |
| 636 if (!status_widget_) | 640 if (!status_widget_) |
| 637 status_widget_ = internal::CreateStatusArea(tray_.get()); | 641 status_widget_ = internal::CreateStatusArea(tray_.get()); |
| 638 | 642 |
| 639 // This controller needs to be set before SetupManagedWindowMode. | 643 // This controller needs to be set before SetupManagedWindowMode. |
| 640 desktop_background_controller_.reset(new DesktopBackgroundController); | 644 desktop_background_controller_.reset(new DesktopBackgroundController); |
| 641 | 645 |
| 642 InitLayoutManagers(); | 646 InitLayoutManagers(); |
| 643 | 647 |
| 644 if (!command_line->HasSwitch(switches::kAuraNoShadows)) { | 648 if (!command_line->HasSwitch(switches::kAuraNoShadows)) { |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 // Create the desktop background image. | 805 // Create the desktop background image. |
| 802 desktop_background_controller_->SetDefaultDesktopBackgroundImage(); | 806 desktop_background_controller_->SetDefaultDesktopBackgroundImage(); |
| 803 } | 807 } |
| 804 | 808 |
| 805 void Shell::DisableWorkspaceGridLayout() { | 809 void Shell::DisableWorkspaceGridLayout() { |
| 806 if (workspace_controller_.get()) | 810 if (workspace_controller_.get()) |
| 807 workspace_controller_->workspace_manager()->set_grid_size(0); | 811 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 808 } | 812 } |
| 809 | 813 |
| 810 } // namespace ash | 814 } // namespace ash |
| OLD | NEW |