diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 23:49:48 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 23:49:48 +0000 |
| commit | 9a2c26235dda5f54a8af490b19213233b05da57e (patch) | |
| tree | 038a3b6e19d660acb1aee86323a6d309a4fd8c31 /chrome/browser/chromeos/login | |
| parent | 7b947813dafb0ad5e6e2eee08fd207e048a11eb2 (diff) | |
| download | chromium_src-9a2c26235dda5f54a8af490b19213233b05da57e.zip chromium_src-9a2c26235dda5f54a8af490b19213233b05da57e.tar.gz chromium_src-9a2c26235dda5f54a8af490b19213233b05da57e.tar.bz2 | |
Use BubbleWindow for ChromeOS windows/dialogs.
BUG=chromium-os:7216
TEST=Verify all windows/dialogs use new bubble design, e.g. JS dialog, page info window, certificate view, extension install confirmation, save as dialog etc.
Review URL: http://codereview.chromium.org/3538012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/login')
| -rw-r--r-- | chrome/browser/chromeos/login/eula_view.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/existing_user_controller.cc | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc index bcb2778..13738ea 100644 --- a/chrome/browser/chromeos/login/eula_view.cc +++ b/chrome/browser/chromeos/login/eula_view.cc @@ -25,6 +25,7 @@ #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/dom_view.h" +#include "chrome/browser/views/window.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/url_constants.h" #include "cros/chromeos_cryptohome.h" @@ -372,7 +373,7 @@ void EulaView::LinkActivated(views::Link* source, int event_flags) { chromeos::CryptohomeTpmGetPassword(&password)) { TpmInfoView* view = new TpmInfoView(ASCIIToWide(password)); view->Init(); - views::Window* window = views::Window::CreateChromeWindow( + views::Window* window = browser::CreateViewsWindow( GetNativeWindow(), gfx::Rect(), view); window->SetIsAlwaysOnTop(true); window->Show(); diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index d317e7b..269f4d7 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -28,6 +28,7 @@ #include "chrome/browser/chromeos/login/message_bubble.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/wm_ipc.h" +#include "chrome/browser/views/window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "gfx/native_widget_types.h" @@ -394,7 +395,7 @@ void ExistingUserController::OnLoginFailure(const LoginFailure& failure) { CaptchaView* view = new CaptchaView(failure.error().captcha().image_url); view->set_delegate(this); - views::Window* window = views::Window::CreateChromeWindow( + views::Window* window = browser::CreateViewsWindow( GetNativeWindow(), gfx::Rect(), view); window->SetIsAlwaysOnTop(true); window->Show(); @@ -509,9 +510,9 @@ void ExistingUserController::OnPasswordChangeDetected( } PasswordChangedView* view = new PasswordChangedView(this); - views::Window* window = views::Window::CreateChromeWindow(GetNativeWindow(), - gfx::Rect(), - view); + views::Window* window = browser::CreateViewsWindow(GetNativeWindow(), + gfx::Rect(), + view); window->SetIsAlwaysOnTop(true); window->Show(); } |