[cros, Aura] Make screen_mode static variable in 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/base_login_display_host.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_view_chromeos.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"
@@ skipping 56 matching lines @@
   SetIntegerLocalPref(prefs::kCarrierDealPromoShown, value);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton
 
-NetworkMenuButton::NetworkMenuButton(
-    StatusAreaButton::Delegate* delegate,
-    StatusAreaViewChromeos::ScreenMode screen_mode)
+NetworkMenuButton::NetworkMenuButton(StatusAreaButton::Delegate* delegate)
     : 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)) {
   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_menu_.reset(new NetworkMenu(this));
   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) {
     cellular_device_path_ = cellular->device_path();
@@ skipping 238 matching lines @@
     }
     cellular_device_path_ = new_cellular_device_path;
   }
 }
 
 void NetworkMenuButton::ShowOptionalMobileDataPromoNotification(
     NetworkLibrary* cros) {
   // Display one-time notification for non-Guest users on first use
   // of Mobile Data connection or if there's a carrier deal defined
   // show that even if user has already seen generic promo.
-  if (is_browser_mode_ && !UserManager::Get()->IsLoggedInAsGuest() &&
+  if (StatusAreaViewChromeos::IsBrowserMode() &&
+      !UserManager::Get()->IsLoggedInAsGuest() &&
       check_for_promo_ && BrowserList::GetLastActive() &&
       cros->cellular_connected() && !cros->ethernet_connected() &&
       !cros->wifi_connected()) {
     std::string deal_text;
     int carrier_deal_promo_pref = -1;
     const MobileConfig::CarrierDeal* deal = NULL;
     const MobileConfig::Carrier* carrier = GetCarrier(cros);
     if (carrier)
       deal = GetCarrierDeal(carrier);
     if (deal) {
@@ skipping 68 matching lines @@
       SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
   }
 }
 
 void NetworkMenuButton::SetTooltipAndAccessibleName(const string16& label) {
   SetTooltipText(label);
   SetAccessibleName(label);
 }
 
 }  // namespace chromeos