Add status area to Aura builds.

chrome/browser/chromeos/status/clock_menu_button.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
-#include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "unicode/datefmt.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 // views::MenuItemView item ids
 enum ClockMenuItem {
   CLOCK_DISPLAY_ITEM,
   CLOCK_OPEN_OPTIONS_ITEM
 };
 
 }  // namespace
 
-namespace chromeos {
-
 // Amount of slop to add into the timer to make sure we're into the next minute
 // when the timer goes off.
 const int kTimerSlopSeconds = 1;
 
 ClockMenuButton::ClockMenuButton(StatusAreaButton::Delegate* delegate)
     : StatusAreaButton(delegate, this),
       default_use_24hour_clock_(false) {
   set_id(VIEW_ID_STATUS_BUTTON_CLOCK);
+#if defined(OS_CHROMEOS)

[DaveMoore, 2011/11/10 02:05:46]

Whenever we have a #if defined(OS_CHROMEOS) in a file that has chromeos in the
path we should include an explaination.

[stevenjb, 2011/11/10 19:57:52]

Done.

   // Start monitoring the kUse24HourClock preference.
   Profile* profile = ProfileManager::GetDefaultProfile();
   if (profile) {  // This can be NULL in the login screen.
     registrar_.Init(profile->GetPrefs());
     registrar_.Add(prefs::kUse24HourClock, this);
   }
-
+#endif
   UpdateTextAndSetNextTimer();
 }
 
 ClockMenuButton::~ClockMenuButton() {
   timer_.Stop();
 }
 
 void ClockMenuButton::UpdateTextAndSetNextTimer() {
   UpdateText();
 
@@ skipping 42 matching lines @@
 
   default_use_24hour_clock_ = use_24hour_clock;
   UpdateText();
 }
 
 // ClockMenuButton, content::NotificationObserver implementation:
 
 void ClockMenuButton::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
+#if defined(OS_CHROMEOS)
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* pref_name = content::Details<std::string>(details).ptr();
     if (*pref_name == prefs::kUse24HourClock) {
       UpdateText();
     }
   }
+#endif
 }
 
 // ClockMenuButton, views::MenuDelegate implementation:
 string16 ClockMenuButton::GetLabel(int id) const {
   DCHECK_EQ(CLOCK_DISPLAY_ITEM, id);
   return base::TimeFormatFriendlyDate(base::Time::Now());
 }
 
 bool ClockMenuButton::IsCommandEnabled(int id) const {
   DCHECK(id == CLOCK_DISPLAY_ITEM || id == CLOCK_OPEN_OPTIONS_ITEM);
   return id == CLOCK_OPEN_OPTIONS_ITEM;
 }
 
 void ClockMenuButton::ExecuteCommand(int id) {
   DCHECK_EQ(CLOCK_OPEN_OPTIONS_ITEM, id);
   delegate()->ExecuteStatusAreaCommand(
-      this, StatusAreaViewChromeos::SHOW_SYSTEM_OPTIONS);
+      this, StatusAreaButton::Delegate::SHOW_SYSTEM_OPTIONS);
 }
 
 int ClockMenuButton::horizontal_padding() {
   return 3;
 }
 
 // ClockMenuButton, views::ViewMenuDelegate implementation:
 
 void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
   // View passed in must be a views::MenuButton, i.e. the ClockMenuButton.
@@ skipping 23 matching lines @@
 
   views::MenuItemView* menu = new views::MenuItemView(this);
   // menu_runner_ takes ownership of menu.
   menu_runner_.reset(new views::MenuRunner(menu));
 
   // Text for this item will be set by GetLabel().
   menu->AppendDelegateMenuItem(CLOCK_DISPLAY_ITEM);
 
   // If options UI is available, show a separator and configure menu item.
   if (delegate()->ShouldExecuteStatusAreaCommand(
-          this, StatusAreaViewChromeos::SHOW_SYSTEM_OPTIONS)) {
+          this, StatusAreaButton::Delegate::SHOW_SYSTEM_OPTIONS)) {
     menu->AppendSeparator();
 
     const string16 clock_open_options_label =
         l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG);
     menu->AppendMenuItemWithLabel(CLOCK_OPEN_OPTIONS_ITEM,
                                   clock_open_options_label);
   }
 }
-
-}  // namespace chromeos