Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: chrome/browser/chromeos/status/status_area_view_chromeos.cc

Issue 8500005: Reverting this as it breaks (at least) the Windows Aura build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/status_area_view_chromeos.cc
===================================================================
--- chrome/browser/chromeos/status/status_area_view_chromeos.cc (revision 110804)
+++ chrome/browser/chromeos/status/status_area_view_chromeos.cc (working copy)
@@ -30,7 +30,7 @@
void StatusAreaViewChromeos::Init(StatusAreaButton::Delegate* delegate,
ScreenMode screen_mode) {
- AddChromeosButtons(this, delegate, screen_mode, NULL);
+ AddChromeosButtons(this, delegate, screen_mode);
}
void StatusAreaViewChromeos::SystemResumed() {
@@ -59,8 +59,7 @@
void StatusAreaViewChromeos::AddChromeosButtons(
StatusAreaView* status_area,
StatusAreaButton::Delegate* delegate,
- ScreenMode screen_mode,
- ClockMenuButton** clock_button) {
+ ScreenMode screen_mode) {
const bool border = true;
const bool no_border = false;
@@ -70,10 +69,7 @@
status_area->AddButton(
new AccessibilityMenuButton(delegate, screen_mode), border);
status_area->AddButton(new CapsLockMenuButton(delegate), border);
- ClockMenuButton* clock = new ClockMenuButton(delegate);
- status_area->AddButton(clock, border);
- if (clock_button)
- *clock_button = clock;
+ status_area->AddButton(new ClockMenuButton(delegate), border);
status_area->AddButton(
new InputMethodMenuButton(delegate, screen_mode), no_border);
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view_chromeos.h ('k') | chrome/browser/chromeos/status/timezone_clock_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698