diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 20:10:14 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 20:10:14 +0000 |
| commit | 8053408224c37ade07452972e01de6126d074d27 (patch) | |
| tree | c29a380c92de9afd1f3dbaa0765f2a4fca6cf743 | |
| parent | 2f46b251365619976696e5ec2df26c7b955de9ef (diff) | |
| download | chromium_src-8053408224c37ade07452972e01de6126d074d27.zip chromium_src-8053408224c37ade07452972e01de6126d074d27.tar.gz chromium_src-8053408224c37ade07452972e01de6126d074d27.tar.bz2 | |
Clean up a Todo for Aura.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8355010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106363 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/setting_level_bubble.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc index bb8df23..c546f88 100644 --- a/chrome/browser/chromeos/setting_level_bubble.cc +++ b/chrome/browser/chromeos/setting_level_bubble.cc @@ -57,11 +57,7 @@ namespace chromeos { // TODO(glotov): remove this in favor of enabling Bubble class act // without |parent| specified. crosbug.com/4025 static views::Widget* GetToplevelWidget() { -#if defined(USE_AURA) - // TODO(saintlou): Need to fix in PureViews. - return WebUILoginDisplay::GetLoginWindow(); -#else - GtkWindow* window = NULL; + gfx::NativeWindow window = NULL; // We just use the default profile here -- this gets overridden as needed // in Chrome OS depending on whether the user is logged in or not. @@ -70,19 +66,22 @@ static views::Widget* GetToplevelWidget() { ProfileManager::GetDefaultProfile(), true); // match_incognito if (browser) { - window = GTK_WINDOW(browser->window()->GetNativeHandle()); + window = browser->window()->GetNativeHandle(); } else { +#if defined(USE_AURA) + // TODO(saintlou): Unsure what to do for the Aura background. +#else // Otherwise, see if there's a background window that we can use. BackgroundView* background = LoginUtils::Get()->GetBackgroundView(); if (background) window = GTK_WINDOW(background->GetNativeWindow()); +#endif } if (window) return views::Widget::GetWidgetForNativeWindow(window); else return WebUILoginDisplay::GetLoginWindow(); -#endif } SettingLevelBubble::SettingLevelBubble(SkBitmap* increase_icon, |