diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 04:05:53 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 04:05:53 +0000 |
| commit | 024a03b4bacbfee6d68e807aeb71146906369ff1 (patch) | |
| tree | ff64b0b391f4f7b6bad4ff19fc6aecdd3be11507 /ash/shell.cc | |
| parent | 95f177a2874ccc0cc296366a0f3fb62b5698e8f0 (diff) | |
| download | chromium_src-024a03b4bacbfee6d68e807aeb71146906369ff1.zip chromium_src-024a03b4bacbfee6d68e807aeb71146906369ff1.tar.gz chromium_src-024a03b4bacbfee6d68e807aeb71146906369ff1.tar.bz2 | |
ash: Move the update notifier into its own row in the popup.
BUG=120195,115357
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9844012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index fb24006..3188cc2 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -36,6 +36,7 @@ #include "ash/system/tray/tray_empty.h" #include "ash/system/tray_accessibility.h" #include "ash/system/tray_caps_lock.h" +#include "ash/system/tray_update.h" #include "ash/system/user/tray_user.h" #include "ash/tooltips/tooltip_controller.h" #include "ash/wm/activation_controller.h" @@ -354,6 +355,8 @@ class DummySystemTrayDelegate : public SystemTrayDelegate { virtual void RequestLockScreen() OVERRIDE {} + virtual void RequestRestart() OVERRIDE {} + virtual void GetAvailableBluetoothDevices( BluetoothDeviceList* list) OVERRIDE { } @@ -690,6 +693,7 @@ void Shell::Init() { new internal::TrayAccessibility; internal::TrayCapsLock* tray_caps_lock = new internal::TrayCapsLock; internal::TrayIME* tray_ime = new internal::TrayIME; + internal::TrayUpdate* tray_update = new internal::TrayUpdate; tray_->accessibility_observer_ = tray_accessibility; tray_->audio_observer_ = tray_volume; @@ -700,7 +704,7 @@ void Shell::Init() { tray_->ime_observer_ = tray_ime; tray_->network_observer_ = tray_network; tray_->power_status_observer_ = tray_power; - tray_->update_observer_ = tray_user; + tray_->update_observer_ = tray_update; tray_->user_observer_ = tray_user; tray_->AddTrayItem(tray_user); @@ -711,6 +715,7 @@ void Shell::Init() { tray_->AddTrayItem(tray_ime); tray_->AddTrayItem(tray_volume); tray_->AddTrayItem(tray_brightness); + tray_->AddTrayItem(tray_update); tray_->AddTrayItem(new internal::TraySettings()); tray_->AddTrayItem(tray_accessibility); tray_->AddTrayItem(tray_caps_lock); |