Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Unified Diff: chrome/browser/chromeos/login/background_view.h

Issue 8438064: Separate StatusAreaView from StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/frame/browser_view.cc ('k') | chrome/browser/chromeos/login/background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/background_view.h
diff --git a/chrome/browser/chromeos/login/background_view.h b/chrome/browser/chromeos/login/background_view.h
index 53d8a0e065d2b21515256f6a3fd3f94515e74086..db59247ac97abed34da25352bd7967517d8c1070 100644
--- a/chrome/browser/chromeos/login/background_view.h
+++ b/chrome/browser/chromeos/login/background_view.h
@@ -7,8 +7,9 @@
#pragma once
#include "chrome/browser/chromeos/login/login_html_dialog.h"
-#include "chrome/browser/chromeos/status/status_area_host.h"
#include "chrome/browser/chromeos/login/version_info_updater.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
+#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
#include "views/view.h"
namespace views {
@@ -26,12 +27,11 @@ namespace chromeos {
class OobeProgressBar;
class ShutdownButton;
-class StatusAreaView;
// View used to render the background during login. BackgroundView contains
// StatusAreaView.
class BackgroundView : public views::View,
- public StatusAreaHost,
+ public StatusAreaButton::Delegate,
public LoginHtmlDialog::Delegate,
public VersionInfoUpdater::Delegate {
public:
@@ -68,8 +68,8 @@ class BackgroundView : public views::View,
// Create a modal popup view.
void CreateModalPopup(views::WidgetDelegate* view);
- // Overridden from StatusAreaHost:
- virtual gfx::NativeWindow GetNativeWindow() const;
+ // Gets the native window from the view widget.
+ gfx::NativeWindow GetNativeWindow() const;
// Toggles status area visibility.
void SetStatusAreaVisible(bool visible);
@@ -109,14 +109,13 @@ class BackgroundView : public views::View,
virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
virtual void OnLocaleChanged() OVERRIDE;
- // Overridden from StatusAreaHost:
- virtual Profile* GetProfile() const OVERRIDE;
- virtual void ExecuteBrowserCommand(int id) const OVERRIDE {}
- virtual bool ShouldOpenButtonOptions(
- const views::View* button_view) const OVERRIDE;
- virtual void OpenButtonOptions(const views::View* button_view) OVERRIDE;
- virtual ScreenMode GetScreenMode() const OVERRIDE;
- virtual TextStyle GetTextStyle() const OVERRIDE;
+ // Overridden from StatusAreaButton::Delegate:
+ virtual bool ShouldExecuteStatusAreaCommand(
+ const views::View* button_view, int command_id) const OVERRIDE;
+ virtual void ExecuteStatusAreaCommand(
+ const views::View* button_view, int command_id) OVERRIDE;
+ virtual gfx::Font GetStatusAreaFont(const gfx::Font& font) const OVERRIDE;
+ virtual StatusAreaButton::TextStyle GetStatusAreaTextStyle() const OVERRIDE;
virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE;
// Overridden from LoginHtmlDialog::Delegate:
@@ -128,6 +127,10 @@ class BackgroundView : public views::View,
virtual void OnBootTimesLabelTextUpdated(
const std::string& boot_times_label_text) OVERRIDE;
+ void set_screen_mode(StatusAreaViewChromeos::ScreenMode mode) {
+ screen_mode_ = mode;
+ }
+
private:
// Creates and adds the status_area.
void InitStatusArea();
@@ -141,7 +144,8 @@ class BackgroundView : public views::View,
void UpdateWindowType();
// All of these variables could be NULL.
- StatusAreaView* status_area_;
+ StatusAreaViewChromeos* status_area_;
+ StatusAreaViewChromeos::ScreenMode screen_mode_;
views::Label* os_version_label_;
views::Label* boot_times_label_;
OobeProgressBar* progress_bar_;
« no previous file with comments | « chrome/browser/chromeos/frame/browser_view.cc ('k') | chrome/browser/chromeos/login/background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698