summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 23:43:46 +0000
committerjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 23:43:46 +0000
commitb11ae6ba05737a74422b7bfe886fe3fd42ee1b3f (patch)
tree33cc6186ae5e8b9de323b426c1757819e3659662 /ash
parentac8b7a620238b90e2629b7c7d0fa7ecca7638a50 (diff)
downloadchromium_src-b11ae6ba05737a74422b7bfe886fe3fd42ee1b3f.zip
chromium_src-b11ae6ba05737a74422b7bfe886fe3fd42ee1b3f.tar.gz
chromium_src-b11ae6ba05737a74422b7bfe886fe3fd42ee1b3f.tar.bz2
Remove network and vpn detailed view from the locked screen.
BUG=156177 Review URL: https://codereview.chromium.org/11365037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/bluetooth/tray_bluetooth.cc2
-rw-r--r--ash/system/chromeos/network/tray_network.cc7
-rw-r--r--ash/system/chromeos/network/tray_sms.cc2
-rw-r--r--ash/system/chromeos/network/tray_vpn.cc6
-rw-r--r--ash/system/drive/tray_drive.cc2
-rw-r--r--ash/system/ime/tray_ime.cc2
-rw-r--r--ash/system/tray/tray_item_more.cc26
-rw-r--r--ash/system/tray/tray_item_more.h6
8 files changed, 34 insertions, 19 deletions
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index 50df5aa..ac4cd15 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -32,7 +32,7 @@ namespace tray {
class BluetoothDefaultView : public TrayItemMore {
public:
explicit BluetoothDefaultView(SystemTrayItem* owner)
- : TrayItemMore(owner) {
+ : TrayItemMore(owner, true) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToImageSkia());
UpdateLabel();
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 97af732..7ea2f56 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -114,8 +114,8 @@ class NetworkTrayView : public TrayItemView {
class NetworkDefaultView : public TrayItemMore {
public:
- explicit NetworkDefaultView(SystemTrayItem* owner)
- : TrayItemMore(owner) {
+ NetworkDefaultView(SystemTrayItem* owner, bool show_more)
+ : TrayItemMore(owner, show_more) {
Update();
}
@@ -525,7 +525,8 @@ views::View* TrayNetwork::CreateTrayView(user::LoginStatus status) {
views::View* TrayNetwork::CreateDefaultView(user::LoginStatus status) {
CHECK(default_ == NULL);
- default_ = new tray::NetworkDefaultView(this);
+ default_ =
+ new tray::NetworkDefaultView(this, status != user::LOGGED_IN_LOCKED);
return default_;
}
diff --git a/ash/system/chromeos/network/tray_sms.cc b/ash/system/chromeos/network/tray_sms.cc
index 65ff9c6..f9ec86e 100644
--- a/ash/system/chromeos/network/tray_sms.cc
+++ b/ash/system/chromeos/network/tray_sms.cc
@@ -52,7 +52,7 @@ namespace internal {
class TraySms::SmsDefaultView : public TrayItemMore {
public:
explicit SmsDefaultView(TraySms* tray)
- : TrayItemMore(tray),
+ : TrayItemMore(tray, true),
tray_(tray) {
SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_UBER_TRAY_SMS));
diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc
index cc8daa1..04cf1cc 100644
--- a/ash/system/chromeos/network/tray_vpn.cc
+++ b/ash/system/chromeos/network/tray_vpn.cc
@@ -19,8 +19,8 @@ namespace tray {
class VpnDefaultView : public TrayItemMore {
public:
- explicit VpnDefaultView(SystemTrayItem* owner)
- : TrayItemMore(owner) {
+ VpnDefaultView(SystemTrayItem* owner, bool show_more)
+ : TrayItemMore(owner, show_more) {
Update();
}
@@ -133,7 +133,7 @@ views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
if (status == user::LOGGED_IN_NONE)
return NULL;
- default_ = new tray::VpnDefaultView(this);
+ default_ = new tray::VpnDefaultView(this, status != user::LOGGED_IN_LOCKED);
return default_;
}
diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc
index d829dac..7f68fca 100644
--- a/ash/system/drive/tray_drive.cc
+++ b/ash/system/drive/tray_drive.cc
@@ -67,7 +67,7 @@ class DriveDefaultView : public TrayItemMore {
public:
DriveDefaultView(SystemTrayItem* owner,
const DriveOperationStatusList* list)
- : TrayItemMore(owner) {
+ : TrayItemMore(owner, true) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DRIVE).ToImageSkia());
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index 296729d..15da1e3 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -38,7 +38,7 @@ namespace tray {
class IMEDefaultView : public TrayItemMore {
public:
explicit IMEDefaultView(SystemTrayItem* owner)
- : TrayItemMore(owner) {
+ : TrayItemMore(owner, true) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
SetImage(bundle.GetImageNamed(
diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc
index df659b9..2a51a86 100644
--- a/ash/system/tray/tray_item_more.cc
+++ b/ash/system/tray/tray_item_more.cc
@@ -18,8 +18,12 @@
namespace ash {
namespace internal {
-TrayItemMore::TrayItemMore(SystemTrayItem* owner)
- : owner_(owner) {
+TrayItemMore::TrayItemMore(SystemTrayItem* owner, bool show_more)
+ : owner_(owner),
+ show_more_(show_more),
+ icon_(NULL),
+ label_(NULL),
+ more_(NULL) {
SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingBetweenItems));
@@ -29,11 +33,13 @@ TrayItemMore::TrayItemMore(SystemTrayItem* owner)
label_ = new views::Label;
AddChildView(label_);
- more_ = new views::ImageView;
- more_->EnableCanvasFlippingForRTLUI(true);
- more_->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_AURA_UBER_TRAY_MORE).ToImageSkia());
- AddChildView(more_);
+ if (show_more) {
+ more_ = new views::ImageView;
+ more_->EnableCanvasFlippingForRTLUI(true);
+ more_->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+ IDR_AURA_UBER_TRAY_MORE).ToImageSkia());
+ AddChildView(more_);
+ }
}
TrayItemMore::~TrayItemMore() {
@@ -61,6 +67,9 @@ void TrayItemMore::ReplaceIcon(views::View* view) {
}
bool TrayItemMore::PerformAction(const ui::Event& event) {
+ if (!show_more_)
+ return false;
+
owner_->TransitionDetailedView();
return true;
}
@@ -70,6 +79,9 @@ void TrayItemMore::Layout() {
// align.
views::View::Layout();
+ if (!show_more_)
+ return;
+
// Make sure the chevron always has the full size.
gfx::Size size = more_->GetPreferredSize();
gfx::Rect bounds(size);
diff --git a/ash/system/tray/tray_item_more.h b/ash/system/tray/tray_item_more.h
index 4b570fb..ca20f45 100644
--- a/ash/system/tray/tray_item_more.h
+++ b/ash/system/tray/tray_item_more.h
@@ -24,7 +24,7 @@ namespace internal {
// the detailed view of the tray-item that owns it.
class TrayItemMore : public ActionableView {
public:
- explicit TrayItemMore(SystemTrayItem* owner);
+ TrayItemMore(SystemTrayItem* owner, bool show_more);
virtual ~TrayItemMore();
void SetLabel(const string16& label);
@@ -33,7 +33,7 @@ class TrayItemMore : public ActionableView {
protected:
// Replaces the default icon (on the left of the label), and allows a custom
- // view to be palced there. Once the default icon is replaced, |SetImage|
+ // view to be placed there. Once the default icon is replaced, |SetImage|
// should never be called.
void ReplaceIcon(views::View* view);
@@ -46,6 +46,8 @@ class TrayItemMore : public ActionableView {
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
SystemTrayItem* owner_;
+ // True if |more_| should be shown.
+ bool show_more_;
views::ImageView* icon_;
views::Label* label_;
views::ImageView* more_;