Fix shutdown button's background.

Don't show shutdown button on take picture screen.

BUG=chromium-os:9231, chromium-os:8736
TEST=none

Review URL: http://codereview.chromium.org/5210002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66663 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 21 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index 0a8de2b..678fd5b 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -121,11 +121,19 @@ void BackgroundView::Init(const GURL& background_url) {
   }
 }
 
-void BackgroundView::EnableShutdownButton() {
-  DCHECK(!shutdown_button_);
-  shutdown_button_ = new ShutdownButton();
-  shutdown_button_->Init();
-  AddChildView(shutdown_button_);
+void BackgroundView::EnableShutdownButton(bool enable) {
+  if (enable) {
+    if (shutdown_button_)
+      return;
+    shutdown_button_ = new ShutdownButton();
+    shutdown_button_->Init();
+    AddChildView(shutdown_button_);
+  } else {
+    if (!shutdown_button_)
+      return;
+    delete shutdown_button_;
+    shutdown_button_ = NULL;
+  }
 }
 
 // static
diff --git a/chrome/browser/chromeos/login/background_view.h b/chrome/browser/chromeos/login/background_view.h
index fec31c5..f967942 100644
--- a/chrome/browser/chromeos/login/background_view.h
+++ b/chrome/browser/chromeos/login/background_view.h
@@ -53,8 +53,8 @@ class BackgroundView : public views::View,
   // it creates a DOMView background area that renders a webpage.
   void Init(const GURL& background_url);
 
-  // Enable shutdown button.
-  void EnableShutdownButton();
+  // Enable/disable shutdown button.
+  void EnableShutdownButton(bool enable);
 
   // Creates a window containing an instance of WizardContentsView as the root
   // view. The caller is responsible for showing (and closing) the returned
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index f102542..da0b9a0 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -161,7 +161,7 @@ void ExistingUserController::Init() {
         background_bounds_,
         GURL(url_string),
         &background_view_);
-    background_view_->EnableShutdownButton();
+    background_view_->EnableShutdownButton(true);
 
     if (!WizardController::IsDeviceRegistered()) {
       background_view_->SetOobeProgressBarVisible(true);
diff --git a/chrome/browser/chromeos/login/shutdown_button.cc b/chrome/browser/chromeos/login/shutdown_button.cc
index 5e79c40..7a3b776 100644
--- a/chrome/browser/chromeos/login/shutdown_button.cc
+++ b/chrome/browser/chromeos/login/shutdown_button.cc
@@ -24,8 +24,8 @@ const int kBottomPadding = 12;
 const int kRightPadding = 12;
 
 // Normal/Hover colors.
-const SkColor kButtonColor = 0xFF242A35;
-const SkColor kHoverColor = 0xFF353E4E;
+const SkColor kShutdownButtonColor = 0xFF242A35;
+const SkColor kShutdownHoverColor = 0xFF353E4E;
 
 // Padding inside button.
 const int kVerticalPadding = 13;
@@ -83,9 +83,9 @@ void ShutdownButton::Init() {
   set_background(
       new HoverBackground(
           CreateRoundedBackground(
-              kCornerRadius, 0, kButtonColor, 0),
+              kCornerRadius, 0, kShutdownButtonColor, 0),
           CreateRoundedBackground(
-              kCornerRadius, 0, kHoverColor, 0)));
+              kCornerRadius, 0, kShutdownHoverColor, 0)));
   set_border(
       views::Border::CreateEmptyBorder(kVerticalPadding,
                                        kHorizontalPadding,
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 54f12c2..0d16e63 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -446,6 +446,7 @@ void WizardController::ShowUserImageScreen() {
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetUserImageScreen());
   background_view_->SetOobeProgress(chromeos::BackgroundView::PICTURE);
+  background_view_->EnableShutdownButton(false);
 }
 
 void WizardController::ShowEulaScreen() {