diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 22:57:54 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 22:57:54 +0000 |
| commit | 3a10282573a80d5e6b3b3cdf73d53533c2e31c05 (patch) | |
| tree | c7c3785d4e9afb8e12cf79c9689748566c374f03 /ash/system | |
| parent | b59412cdbd4f758d38905f7d16cb501fa6b46066 (diff) | |
| download | chromium_src-3a10282573a80d5e6b3b3cdf73d53533c2e31c05.zip chromium_src-3a10282573a80d5e6b3b3cdf73d53533c2e31c05.tar.gz chromium_src-3a10282573a80d5e6b3b3cdf73d53533c2e31c05.tar.bz2 | |
Remove bluetooth detail page access from ash tray bubble when screen is locked.
BUG=174485
Review URL: https://codereview.chromium.org/12207194
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/bluetooth/tray_bluetooth.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc index bdb9428..a6c7acb 100644 --- a/ash/system/bluetooth/tray_bluetooth.cc +++ b/ash/system/bluetooth/tray_bluetooth.cc @@ -32,8 +32,8 @@ namespace tray { class BluetoothDefaultView : public TrayItemMore { public: - explicit BluetoothDefaultView(SystemTrayItem* owner) - : TrayItemMore(owner, true) { + BluetoothDefaultView(SystemTrayItem* owner, bool show_more) + : TrayItemMore(owner, show_more) { ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToImageSkia()); UpdateLabel(); @@ -362,7 +362,8 @@ views::View* TrayBluetooth::CreateTrayView(user::LoginStatus status) { views::View* TrayBluetooth::CreateDefaultView(user::LoginStatus status) { CHECK(default_ == NULL); - default_ = new tray::BluetoothDefaultView(this); + default_ = new tray::BluetoothDefaultView( + this, status != user::LOGGED_IN_LOCKED); return default_; } |