Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/login/screen_locker_views.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/login/screen_locker_views.h"
 
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
 // Evil hack to undo X11 evil #define.
 #undef None
 #undef Status
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/login_performer.h"
 #include "chrome/browser/chromeos/login/message_bubble.h"
 #include "chrome/browser/chromeos/login/screen_lock_view.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/shutdown_button.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/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/screen.h"
 
@@ skipping 347 matching lines @@
 // BackgroundView for ScreenLocker, which layouts a lock widget in
 // addition to other background components.
 class ScreenLockerBackgroundView
     : public chromeos::BackgroundView,
       public chromeos::ScreenLockerViews::ScreenLockViewContainer {
  public:
   ScreenLockerBackgroundView(views::Widget* lock_widget,
                              views::View* screen_lock_view)
       : lock_widget_(lock_widget),
         screen_lock_view_(screen_lock_view) {
-  }
-
-  virtual ScreenMode GetScreenMode() const OVERRIDE {
-    return kScreenLockerMode;
+    set_screen_mode(chromeos::StatusAreaViewChromeos::SCREEN_LOCKER_MODE);
   }
 
   virtual void Layout() OVERRIDE {
     chromeos::BackgroundView::Layout();
     gfx::Rect screen = bounds();
     if (screen_lock_view_) {
       gfx::Size size = screen_lock_view_->GetPreferredSize();
       gfx::Point origin((screen.width() - size.width()) / 2,
                         (screen.height() - size.height()) / 2);
       gfx::Size widget_size(screen.size());
@@ skipping 522 matching lines @@
 #if defined(TOOLKIT_USES_GTK)
   WmIpc::Message msg;
   WmIpc::instance()->DecodeMessage(*event, &msg);
   if (msg.type() == WM_IPC_MESSAGE_CHROME_NOTIFY_SCREEN_REDRAWN_FOR_LOCK) {
     OnWindowManagerReady();
   }
 #endif
 }
 
 }  // namespace chromeos