Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/status/network_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/network_menu_button.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
-#include "chrome/browser/chromeos/status/status_area_host.h"
+#include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/pref_names.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 "views/widget/widget.h"
@@ skipping 55 matching lines @@
   SetIntegerLocalPref(prefs::kCarrierDealPromoShown, value);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton
 
-NetworkMenuButton::NetworkMenuButton(StatusAreaHost* host)
-    : StatusAreaButton(host, this),
+NetworkMenuButton::NetworkMenuButton(
+    StatusAreaButton::Delegate* delegate,
+    StatusAreaViewChromeos::ScreenMode screen_mode)
+    : StatusAreaButton(delegate, this),
       mobile_data_bubble_(NULL),
       is_browser_mode_(false),
       check_for_promo_(true),
       was_sim_locked_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
-  is_browser_mode_ = (host->GetScreenMode() == StatusAreaHost::kBrowserMode);
+  set_id(VIEW_ID_STATUS_BUTTON_NETWORK_MENU);
+  is_browser_mode_ = (screen_mode == StatusAreaViewChromeos::BROWSER_MODE);
   network_menu_.reset(new NetworkMenu(this, is_browser_mode_));
   network_icon_.reset(
       new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE));
 
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
   OnNetworkManagerChanged(network_library);
   network_library->AddNetworkManagerObserver(this);
   network_library->AddCellularDataPlanObserver(this);
   const NetworkDevice* cellular = network_library->FindCellularDevice();
   if (cellular) {
@@ skipping 70 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, NetworkMenu implementation:
 
 views::MenuButton* NetworkMenuButton::GetMenuButton() {
   return this;
 }
 
 gfx::NativeWindow NetworkMenuButton::GetNativeWindow() const {
-  return host_->GetNativeWindow();
+  // This must always have a parent, which must have a widget ancestor.
+  return parent()->GetWidget()->GetNativeWindow();
 }
 
 void NetworkMenuButton::OpenButtonOptions() {
-  host_->OpenButtonOptions(this);
+  delegate()->ExecuteStatusAreaCommand(
+      this, StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS);
 }
 
 bool NetworkMenuButton::ShouldOpenButtonOptions() const {
-  return host_->ShouldOpenButtonOptions(this);
+  return delegate()->ShouldExecuteStatusAreaCommand(
+      this, StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, views::View implementation:
 
 void NetworkMenuButton::OnLocaleChanged() {
   SetNetworkIcon();
   network_menu_->UpdateMenu();
 }
 
@@ skipping 220 matching lines @@
       SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
   }
 }
 
 void NetworkMenuButton::SetTooltipAndAccessibleName(const string16& label) {
   SetTooltipText(label);
   SetAccessibleName(label);
 }
 
 }  // namespace chromeos