Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/status/caps_lock_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/caps_lock_menu_button.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/status/status_area_bubble.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
+#include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.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 "ui/gfx/image/image.h"
 #include "views/controls/image_view.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 const size_t kMaxBubbleCount = 3;
 
-// Returns PrefService object associated with |host|.
-PrefService* GetPrefService(chromeos::StatusAreaHost* host) {
-  if (host->GetProfile())
-    return host->GetProfile()->GetPrefs();
+PrefService* GetPrefService() {
+  Profile* profile = ProfileManager::GetDefaultProfile();
+  if (profile)
+    return profile->GetPrefs();
   return NULL;
 }
 
 views::ImageView* CreateImageViewWithCapsLockIcon() {
   const gfx::Image& image =
       ResourceBundle::GetSharedInstance().GetImageNamed(IDR_CAPS_LOCK_ICON);
   views::ImageView* image_view = new views::ImageView;
   image_view->SetImage(image.ToSkBitmap());
   return image_view;
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // CapsLockMenuButton
 
-CapsLockMenuButton::CapsLockMenuButton(StatusAreaHost* host)
-    : StatusAreaButton(host, this),
-      prefs_(GetPrefService(host)),
+CapsLockMenuButton::CapsLockMenuButton(StatusAreaButton::Delegate* delegate)
+    : StatusAreaButton(delegate, this),
+      prefs_(GetPrefService()),
       status_(NULL),
       should_show_bubble_(true),
       bubble_count_(0) {
+  set_id(VIEW_ID_STATUS_BUTTON_CAPS_LOCK);
   if (prefs_)
     remap_search_key_to_.Init(
         prefs::kLanguageXkbRemapSearchKeyTo, prefs_, this);
 
   SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_STATUSBAR_CAPS_LOCK));
   UpdateAccessibleName();
   UpdateUIFromCurrentCapsLock(input_method::XKeyboard::CapsLockIsEnabled());
   if (SystemKeyEventListener::GetInstance())
     SystemKeyEventListener::GetInstance()->AddCapsLockObserver(this);
@@ skipping 157 matching lines @@
 }
 
 bool CapsLockMenuButton::HasCapsLock() const {
   return (prefs_ &&
           (remap_search_key_to_.GetValue() == input_method::kCapsLockKey)) ||
       // A keyboard for Linux usually has Caps Lock.
       !system::runtime_environment::IsRunningOnChromeOS();
 }
 
 }  // namespace chromeos