UI polish for certificate viewer

chrome/browser/chromeos/login/existing_user_controller.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/existing_user_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/widget/widget.h"
@@ skipping 258 matching lines @@
     // Network is connected.
     const Network* active_network = network->active_network();
     if (failure.reason() == LoginFailure::NETWORK_AUTH_FAILED &&
         failure.error().state() == GoogleServiceAuthError::CAPTCHA_REQUIRED) {
       if (!failure.error().captcha().image_url.is_empty()) {
         CaptchaView* view =
             new CaptchaView(failure.error().captcha().image_url, false);
         view->Init();
         view->set_delegate(this);
         views::Widget* window = browser::CreateViewsWindow(
-            GetNativeWindow(), view);
+            GetNativeWindow(), view, STYLE_GENERIC);
         window->SetAlwaysOnTop(true);
         window->Show();
       } else {
         LOG(WARNING) << "No captcha image url was found?";
         ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
       }
     } else if (failure.reason() == LoginFailure::NETWORK_AUTH_FAILED &&
                failure.error().state() ==
                    GoogleServiceAuthError::HOSTED_NOT_ALLOWED) {
       ShowError(IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED, error);
@@ skipping 159 matching lines @@
     // Another attempt will be invoked after verification completion.
     return;
   }
 
   // Passing 'false' here enables "full sync" mode in the dialog,
   // which disables the requirement for the old owner password,
   // allowing us to recover from a lost owner password/homedir.
   // TODO(gspencer): We shouldn't have to erase stateful data when
   // doing this.  See http://crosbug.com/9115 http://crosbug.com/7792
   PasswordChangedView* view = new PasswordChangedView(this, false);
-  views::Widget* window = browser::CreateViewsWindow(GetNativeWindow(), view);
+  views::Widget* window = browser::CreateViewsWindow(GetNativeWindow(), view,
+                                                     STYLE_GENERIC);

[flackr, 2011/11/21 20:43:31]

One line per argument once you have to wrap.

[bshe, 2011/11/22 16:26:24]

Done.

   window->SetAlwaysOnTop(true);
   window->Show();
 
   if (login_status_consumer_)
     login_status_consumer_->OnPasswordChangeDetected(credentials);
 }
 
 void ExistingUserController::WhiteListCheckFailed(const std::string& email) {
   ShowError(IDS_LOGIN_ERROR_WHITELIST, email);
 
@@ skipping 87 matching lines @@
   CryptohomeLibrary* cryptohomed = CrosLibrary::Get()->GetCryptohomeLibrary();
   cryptohomed->AsyncSetOwnerUser(
       UserCrosSettingsProvider::cached_owner(), NULL);
 
   // Do not invoke AsyncDoAutomaticFreeDiskSpaceControl(NULL) here
   // so it does not delay the following mount. Cleanup will be
   // started in Cryptohomed by timer.
 }
 
 }  // namespace chromeos