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/options | |
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/options')
-rw-r--r-- | chrome/browser/chromeos/options/internet_page_view.cc | 3 | ||||
-rw-r--r-- | chrome/browser/chromeos/options/language_config_view.cc | 5 | ||||
-rw-r--r-- | chrome/browser/chromeos/options/options_window_view.cc | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc index a095f3b..c22e1c5 100644 --- a/chrome/browser/chromeos/options/internet_page_view.cc +++ b/chrome/browser/chromeos/options/internet_page_view.cc @@ -14,6 +14,7 @@ #include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/chromeos/options/options_window_view.h" #include "chrome/browser/chromeos/status/network_menu.h" +#include "chrome/browser/views/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/native_button.h" @@ -216,7 +217,7 @@ void NetworkSection::AddNetwork(int id, const SkBitmap& icon, } void NetworkSection::CreateModalPopup(views::WindowDelegate* view) { - views::Window* window = views::Window::CreateChromeWindow( + views::Window* window = browser::CreateViewsWindow( GetOptionsViewParent(), gfx::Rect(), view); window->SetIsAlwaysOnTop(true); window->Show(); diff --git a/chrome/browser/chromeos/options/language_config_view.cc b/chrome/browser/chromeos/options/language_config_view.cc index 1ee7845..95e0aa9 100644 --- a/chrome/browser/chromeos/options/language_config_view.cc +++ b/chrome/browser/chromeos/options/language_config_view.cc @@ -20,6 +20,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/restart_message_box.h" +#include "chrome/browser/views/window.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "gfx/font.h" @@ -161,7 +162,7 @@ void LanguageConfigView::ButtonPressed( DLOG(FATAL) << "Config view not found: " << button->input_method_id(); return; } - views::Window* window = views::Window::CreateChromeWindow( + views::Window* window = browser::CreateViewsWindow( GetOptionsViewParent(), gfx::Rect(), config_view); window->SetIsAlwaysOnTop(true); window->Show(); @@ -323,7 +324,7 @@ void LanguageConfigView::InitControlLayout() { void LanguageConfigView::Show(Profile* profile, gfx::NativeWindow parent) { UserMetrics::RecordAction(UserMetricsAction("LanguageConfigView_Open")); - views::Window* window = views::Window::CreateChromeWindow( + views::Window* window = browser::CreateViewsWindow( parent, gfx::Rect(), new LanguageConfigView(profile)); window->SetIsAlwaysOnTop(true); window->Show(); diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc index b9602f21..3247430 100644 --- a/chrome/browser/chromeos/options/options_window_view.cc +++ b/chrome/browser/chromeos/options/options_window_view.cc @@ -17,6 +17,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/accessible_view_helper.h" +#include "chrome/browser/views/window.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" @@ -379,9 +380,9 @@ void ShowOptionsWindow(OptionsPage page, chromeos::CloseOptionsWindow(); OptionsWindowView::instance_ = new OptionsWindowView(profile); - views::Window::CreateChromeWindow(chromeos::GetOptionsViewParent(), - gfx::Rect(), - OptionsWindowView::instance_); + browser::CreateViewsWindow(chromeos::GetOptionsViewParent(), + gfx::Rect(), + OptionsWindowView::instance_); OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group); } |