Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/status/power_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/power_menu_button.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/view_ids.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
@@ skipping 212 matching lines @@
 
  private:
   PowerMenuButton* menu_button_;
   gfx::Font percentage_font_;
   gfx::Font estimate_font_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton
 
-PowerMenuButton::PowerMenuButton(StatusAreaHost* host)
-    : StatusAreaButton(host, this),
+PowerMenuButton::PowerMenuButton(StatusAreaButton::Delegate* delegate)
+    : StatusAreaButton(delegate, this),
       battery_is_present_(false),
       line_power_on_(false),
       battery_percentage_(0.0),
       battery_index_(-1),
       battery_time_to_full_(TimeDelta::FromMicroseconds(kInitialMS)),
       battery_time_to_empty_(TimeDelta::FromMicroseconds(kInitialMS)),
       status_(NULL) {
+  set_id(VIEW_ID_STATUS_BUTTON_POWER);
   UpdateIconAndLabelInfo();
   CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
 }
 
 PowerMenuButton::~PowerMenuButton() {
   CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this);
 }
 
 // PowerMenuButton, views::MenuDelegate implementation:
 
@@ skipping 149 matching lines @@
   // If previous is 0, then it either was never set (initial condition)
   // or got down to 0.
   if (*previous == TimeDelta::FromMicroseconds(kInitialMS) ||
       diff < kMinDiff ||
       diff > kMaxDiff) {
     *previous = current;
   }
 }
 
 }  // namespace chromeos