diff options
| author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 14:30:10 +0000 |
|---|---|---|
| committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 14:30:10 +0000 |
| commit | 0f16f9d6e6e6f0ad70bbae44f578dcb0cb41341e (patch) | |
| tree | adf21f0f02e9df65944920feb65d7f8781390b63 /chrome | |
| parent | 09834fa24c47140d5f2ee37f527404fbe534d622 (diff) | |
| download | chromium_src-0f16f9d6e6e6f0ad70bbae44f578dcb0cb41341e.zip chromium_src-0f16f9d6e6e6f0ad70bbae44f578dcb0cb41341e.tar.gz chromium_src-0f16f9d6e6e6f0ad70bbae44f578dcb0cb41341e.tar.bz2 | |
[cros] Fixed the size of take photo dialog
R=nkostylev@chromium.org
BUG=chromium-os:18204
TEST=Go through OOBE until image screen, click on photo button, verify that the dialog shown is of the correct size.
Review URL: http://codereview.chromium.org/7514007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h | 3 |
2 files changed, 3 insertions, 13 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc index e6c1ca2..fc42af3 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc @@ -9,9 +9,8 @@ #include "base/values.h" #include "chrome/browser/chromeos/login/default_user_images.h" #include "chrome/browser/chromeos/login/user_manager.h" +#include "chrome/browser/chromeos/login/webui_login_display.h" #include "chrome/browser/chromeos/options/take_photo_dialog.h" -#include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/window.h" #include "chrome/browser/ui/webui/web_ui_util.h" #include "grit/generated_resources.h" @@ -131,8 +130,9 @@ void UserImageScreenHandler::OnPhotoAccepted(const SkBitmap& photo) { void UserImageScreenHandler::HandleTakePhoto(const base::ListValue* args) { DCHECK(args && args->empty()); TakePhotoDialog* take_photo_dialog = new TakePhotoDialog(this); + views::Widget* login_window = WebUILoginDisplay::GetLoginWindow(); views::Widget* window = browser::CreateViewsWindow( - GetBrowserWindow(), + login_window->GetNativeWindow(), gfx::Rect(), take_photo_dialog); window->SetAlwaysOnTop(true); @@ -163,11 +163,4 @@ void UserImageScreenHandler::HandleImageAccepted(const base::ListValue* args) { screen_->OnDefaultImageSelected(selected_image_); } -gfx::NativeWindow UserImageScreenHandler::GetBrowserWindow() const { - Browser* browser = BrowserList::FindBrowserWithProfile(web_ui_->GetProfile()); - if (!browser) - return NULL; - return browser->window()->GetNativeHandle(); -} - } // namespace chromeos diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h index 39ac8cd..0c6e647 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h @@ -60,9 +60,6 @@ class UserImageScreenHandler : public UserImageScreenActor, // Called when user accept the image closing the screen. void HandleImageAccepted(const base::ListValue* args); - // Returns handle to browser window or NULL if it can't be found. - gfx::NativeWindow GetBrowserWindow() const; - UserImageScreenActor::Delegate* screen_; // Keeps whether screen should be shown right after initialization. |