diff options
| author | altimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 19:06:36 +0000 |
|---|---|---|
| committer | altimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 19:06:36 +0000 |
| commit | 8430491a1e7e0393e7bf4cff9877af3d48d9664a (patch) | |
| tree | b853d80d6770e269646bc1209f2f3498b379f2c6 /chrome | |
| parent | eb61fc8d78c9083d33bb3d214a98da81a22948ab (diff) | |
| download | chromium_src-8430491a1e7e0393e7bf4cff9877af3d48d9664a.zip chromium_src-8430491a1e7e0393e7bf4cff9877af3d48d9664a.tar.gz chromium_src-8430491a1e7e0393e7bf4cff9877af3d48d9664a.tar.bz2 | |
Fixed touch build after 8395042.
Also used better way of getting top widget for the bubble.
BUG=none
TEST=touch compiles and touch tests pass
Review URL: http://codereview.chromium.org/8423008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/setting_level_bubble.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_input_api.cc | 9 |
2 files changed, 9 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc index 3b10fde3..3ff00df 100644 --- a/chrome/browser/chromeos/setting_level_bubble.cc +++ b/chrome/browser/chromeos/setting_level_bubble.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "chrome/browser/chromeos/login/background_view.h" -#include "chrome/browser/chromeos/login/existing_user_controller.h" +#include "chrome/browser/chromeos/login/base_login_display_host.h" #include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/browser/chromeos/login/login_display_host.h" #include "chrome/browser/chromeos/login/webui_login_display.h" @@ -79,12 +79,9 @@ static views::Widget* GetToplevelWidget() { if (background) { window = GTK_WINDOW(background->GetNativeWindow()); } else { - ExistingUserController* controller = - ExistingUserController::current_controller(); - if (controller) { - window = - GTK_WINDOW(controller->login_display_host()->GetNativeWindow()); - } + LoginDisplayHost* host = BaseLoginDisplayHost::default_host(); + if (host) + window = host->GetNativeWindow(); } #endif } diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index 6621675..79fa4e1 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -26,7 +26,7 @@ #if defined(OS_CHROMEOS) && defined(TOUCH_UI) #include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/ibus_controller.h" -#include "chrome/browser/chromeos/login/webui_login_display.h" +#include "chrome/browser/chromeos/login/base_login_display_host.h" #endif namespace { @@ -82,9 +82,10 @@ views::Widget* GetTopLevelWidget(Browser* browser) { } #if defined(OS_CHROMEOS) && defined(TOUCH_UI) - views::Widget* login_window = chromeos::WebUILoginDisplay::GetLoginWindow(); - if (login_window) - return login_window; + chromeos::LoginDisplayHost* host = + chromeos::BaseLoginDisplayHost::default_host(); + if (host) + return views::Widget::GetWidgetForNativeWindow(host->GetNativeWindow()); #endif if (!browser) |