diff options
7 files changed, 36 insertions, 24 deletions
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index db3516e..ae070eb 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -324,8 +324,9 @@ BrowserView::~BrowserView() { BrowserList::RemoveObserver(this); } -void BrowserView::AddTrayButton(StatusAreaButton* button, bool bordered) { - status_area_->AddButton(button, bordered); +void BrowserView::AddTrayButton(StatusAreaButton* button, + StatusAreaView::ButtonBorder border) { + status_area_->AddButton(button, border); } void BrowserView::RemoveTrayButton(StatusAreaButton* button) { diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h index 8cea500..a3e32f6 100644 --- a/chrome/browser/chromeos/frame/browser_view.h +++ b/chrome/browser/chromeos/frame/browser_view.h @@ -11,6 +11,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" #include "chrome/browser/chromeos/status/status_area_button.h" +#include "chrome/browser/chromeos/status/status_area_view.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "ui/views/context_menu_controller.h" @@ -48,7 +49,8 @@ class BrowserView : public ::BrowserView, // Adds a new tray icon/button to the Chrome OS Tray. // Takes ownership of the button object. - void AddTrayButton(StatusAreaButton* button, bool bordered); + void AddTrayButton(StatusAreaButton* button, + StatusAreaView::ButtonBorder border); // Remove an existing tray button from the Chrome OS Tray. // Pointer will become invalid after this call. diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc index fb04757..ed5ca92 100644 --- a/chrome/browser/chromeos/status/status_area_view.cc +++ b/chrome/browser/chromeos/status/status_area_view.cc @@ -28,9 +28,9 @@ StatusAreaView::StatusAreaView() StatusAreaView::~StatusAreaView() { } -void StatusAreaView::AddButton(StatusAreaButton* button, bool bordered) { +void StatusAreaView::AddButton(StatusAreaButton* button, ButtonBorder border) { buttons_.push_back(button); - if (bordered) + if (border == HAS_BORDER) button->set_border(views::Border::CreateEmptyBorder(0, 1, 0, 0)); AddChildView(button); UpdateButtonVisibility(); diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h index 62e1adc..79e0a9f 100644 --- a/chrome/browser/chromeos/status/status_area_view.h +++ b/chrome/browser/chromeos/status/status_area_view.h @@ -19,10 +19,15 @@ class StatusAreaView : public views::AccessiblePaneView, public base::SupportsWeakPtr<StatusAreaView> { public: + enum ButtonBorder { + NO_BORDER, + HAS_BORDER + }; + explicit StatusAreaView(); virtual ~StatusAreaView(); - void AddButton(StatusAreaButton* button, bool bordered); + void AddButton(StatusAreaButton* button, ButtonBorder border); void RemoveButton(StatusAreaButton* button); void MakeButtonsActive(bool active); diff --git a/chrome/browser/chromeos/status/status_area_view_chromeos.cc b/chrome/browser/chromeos/status/status_area_view_chromeos.cc index b7e21aa..84ca022 100644 --- a/chrome/browser/chromeos/status/status_area_view_chromeos.cc +++ b/chrome/browser/chromeos/status/status_area_view_chromeos.cc @@ -77,23 +77,27 @@ void StatusAreaViewChromeos::AddChromeosButtons( StatusAreaView* status_area, StatusAreaButton::Delegate* delegate, ClockMenuButton** clock_button) { - const bool border = true; - const bool no_border = false; - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMemoryWidget)) - status_area->AddButton(new MemoryMenuButton(delegate), no_border); + status_area->AddButton(new MemoryMenuButton(delegate), + StatusAreaView::NO_BORDER); - status_area->AddButton(new AccessibilityMenuButton(delegate), border); - status_area->AddButton(new CapsLockMenuButton(delegate), border); + status_area->AddButton(new AccessibilityMenuButton(delegate), + StatusAreaView::HAS_BORDER); + status_area->AddButton(new CapsLockMenuButton(delegate), + StatusAreaView::HAS_BORDER); ClockMenuButton* clock = new ClockMenuButton(delegate); - status_area->AddButton(clock, border); + status_area->AddButton(clock, StatusAreaView::HAS_BORDER); if (clock_button) *clock_button = clock; - status_area->AddButton(new VolumeMenuButton(delegate), no_border); - status_area->AddButton(new InputMethodMenuButton(delegate), no_border); - status_area->AddButton(new NetworkMenuButton(delegate), no_border); - status_area->AddButton(new PowerMenuButton(delegate), no_border); + status_area->AddButton(new VolumeMenuButton(delegate), + StatusAreaView::NO_BORDER); + status_area->AddButton(new InputMethodMenuButton(delegate), + StatusAreaView::NO_BORDER); + status_area->AddButton(new NetworkMenuButton(delegate), + StatusAreaView::NO_BORDER); + status_area->AddButton(new PowerMenuButton(delegate), + StatusAreaView::NO_BORDER); } } // namespace chromeos diff --git a/chrome/browser/ui/views/aura/status_area_host_aura.cc b/chrome/browser/ui/views/aura/status_area_host_aura.cc index 312e059..603a0aef 100644 --- a/chrome/browser/ui/views/aura/status_area_host_aura.cc +++ b/chrome/browser/ui/views/aura/status_area_host_aura.cc @@ -95,7 +95,7 @@ views::Widget* StatusAreaHostAura::CreateStatusArea() { // the last button added to status area so that it could be right most there. if (ash::Shell::GetInstance()->IsWindowModeCompact()) { status_area_view_->AddButton(new MultipleWindowIndicatorButton(this), - false); + StatusAreaView::NO_BORDER); } // Create widget to hold status area view. @@ -129,13 +129,13 @@ void StatusAreaHostAura::AddButtons() { if (clock) clock_updater_.reset(new ClockUpdater(clock)); #else - const bool border = true; - const bool no_border = false; #if defined(OS_LINUX) if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMemoryWidget)) - status_area_view_->AddButton(new MemoryMenuButton(this), no_border); + status_area_view_->AddButton(new MemoryMenuButton(this), + StatusAreaView::NO_BORDER); #endif - status_area_view_->AddButton(new ClockMenuButton(this), border); + status_area_view_->AddButton(new ClockMenuButton(this), + StatusAreaView::HAS_BORDER); #endif } diff --git a/chrome/browser/ui/views/status_icons/status_icon_chromeos.cc b/chrome/browser/ui/views/status_icons/status_icon_chromeos.cc index a18a08d..1843b12 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_chromeos.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_chromeos.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -130,7 +130,7 @@ void StatusIconChromeOS::AddIconToBrowser(Browser* browser) { NotificationTrayButton* tray_button = new NotificationTrayButton(this, browser_view); tray_button_map_[browser_view] = tray_button; - browser_view->AddTrayButton(tray_button, false); + browser_view->AddTrayButton(tray_button, StatusAreaView::NO_BORDER); if (!last_image_->empty()) tray_button->SetImage(*last_image_.get()); } |