Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4731)

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 3538012: Use BubbleWindow for ChromeOS windows/dialogs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: fix win trybot Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/options/options_window_view.cc ('k') | chrome/browser/views/about_chrome_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index c90ad0271cf074667007ce70fff4284ce162b61d..11b7aedca8a0f2fdc7ff293f5925bcede8aa0714 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
+#include "chrome/browser/views/window.h"
#include "gfx/canvas_skia.h"
#include "gfx/skbitmap_operations.h"
#include "grit/generated_resources.h"
@@ -106,9 +107,9 @@ void NetworkMenu::ActivatedAt(int index) {
} else if (flags & FLAG_OTHER_NETWORK) {
NetworkConfigView* view = new NetworkConfigView();
view->set_browser_mode(IsBrowserMode());
- views::Window* window = views::Window::CreateChromeWindow(GetNativeWindow(),
- gfx::Rect(),
- view);
+ views::Window* window = browser::CreateViewsWindow(GetNativeWindow(),
+ gfx::Rect(),
+ view);
window->SetIsAlwaysOnTop(true);
window->Show();
view->SetLoginTextfieldFocus();
@@ -121,7 +122,7 @@ void NetworkMenu::ActivatedAt(int index) {
NetworkConfigView* view =
new NetworkConfigView(cros->ethernet_network());
view->set_browser_mode(IsBrowserMode());
- views::Window* window = views::Window::CreateChromeWindow(
+ views::Window* window = browser::CreateViewsWindow(
GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
window->Show();
@@ -144,7 +145,7 @@ void NetworkMenu::ActivatedAt(int index) {
// If we are already connected, open the config dialog.
NetworkConfigView* view = new NetworkConfigView(wifi, false);
view->set_browser_mode(IsBrowserMode());
- views::Window* window = views::Window::CreateChromeWindow(
+ views::Window* window = browser::CreateViewsWindow(
GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
window->Show();
@@ -161,7 +162,7 @@ void NetworkMenu::ActivatedAt(int index) {
} else {
NetworkConfigView* view = new NetworkConfigView(wifi, true);
view->set_browser_mode(IsBrowserMode());
- views::Window* window = views::Window::CreateChromeWindow(
+ views::Window* window = browser::CreateViewsWindow(
GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
window->Show();
@@ -187,7 +188,7 @@ void NetworkMenu::ActivatedAt(int index) {
} else {
NetworkConfigView* view = new NetworkConfigView(cellular);
view->set_browser_mode(IsBrowserMode());
- views::Window* window = views::Window::CreateChromeWindow(
+ views::Window* window = browser::CreateViewsWindow(
GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
window->Show();
« no previous file with comments | « chrome/browser/chromeos/options/options_window_view.cc ('k') | chrome/browser/views/about_chrome_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698