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

Side by Side Diff: chrome/browser/chromeos/network_message_observer.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/network_message_observer.h" 5 #include "chrome/browser/chromeos/network_message_observer.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/browser_list.h" 10 #include "chrome/browser/browser_list.h"
11 #include "chrome/browser/browser_window.h" 11 #include "chrome/browser/browser_window.h"
12 #include "chrome/browser/chromeos/cros/cros_library.h" 12 #include "chrome/browser/chromeos/cros/cros_library.h"
13 #include "chrome/browser/chromeos/cros/network_library.h" 13 #include "chrome/browser/chromeos/cros/network_library.h"
14 #include "chrome/browser/chromeos/options/network_config_view.h" 14 #include "chrome/browser/chromeos/options/network_config_view.h"
15 #include "chrome/browser/views/window.h"
15 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
16 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
17 #include "views/window/dialog_delegate.h" 18 #include "views/window/dialog_delegate.h"
18 #include "views/window/window.h" 19 #include "views/window/window.h"
19 20
20 namespace chromeos { 21 namespace chromeos {
21 22
22 NetworkMessageObserver::NetworkMessageObserver(Profile* profile) 23 NetworkMessageObserver::NetworkMessageObserver(Profile* profile)
23 : initialized_(false), 24 : initialized_(false),
24 notification_connection_error_(profile, "network_connection.chromeos", 25 notification_connection_error_(profile, "network_connection.chromeos",
(...skipping 16 matching lines...) Expand all
41 } 42 }
42 43
43 void NetworkMessageObserver::CreateModalPopup(views::WindowDelegate* view) { 44 void NetworkMessageObserver::CreateModalPopup(views::WindowDelegate* view) {
44 Browser* browser = BrowserList::GetLastActive(); 45 Browser* browser = BrowserList::GetLastActive();
45 if (browser && browser->type() != Browser::TYPE_NORMAL) { 46 if (browser && browser->type() != Browser::TYPE_NORMAL) {
46 browser = BrowserList::FindBrowserWithType(browser->profile(), 47 browser = BrowserList::FindBrowserWithType(browser->profile(),
47 Browser::TYPE_NORMAL, 48 Browser::TYPE_NORMAL,
48 true); 49 true);
49 } 50 }
50 DCHECK(browser); 51 DCHECK(browser);
51 views::Window* window = views::Window::CreateChromeWindow( 52 views::Window* window = browser::CreateViewsWindow(
52 browser->window()->GetNativeHandle(), gfx::Rect(), view); 53 browser->window()->GetNativeHandle(), gfx::Rect(), view);
53 window->SetIsAlwaysOnTop(true); 54 window->SetIsAlwaysOnTop(true);
54 window->Show(); 55 window->Show();
55 } 56 }
56 57
57 void NetworkMessageObserver::NetworkChanged(NetworkLibrary* obj) { 58 void NetworkMessageObserver::NetworkChanged(NetworkLibrary* obj) {
58 const WifiNetworkVector& wifi_networks = obj->wifi_networks(); 59 const WifiNetworkVector& wifi_networks = obj->wifi_networks();
59 const CellularNetworkVector& cellular_networks = obj->cellular_networks(); 60 const CellularNetworkVector& cellular_networks = obj->cellular_networks();
60 61
61 NetworkConfigView* view = NULL; 62 NetworkConfigView* view = NULL;
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 // Got more data, so hide notifications. 207 // Got more data, so hide notifications.
207 notification_low_data_.Hide(); 208 notification_low_data_.Hide();
208 notification_no_data_.Hide(); 209 notification_no_data_.Hide();
209 } 210 }
210 } 211 }
211 212
212 cellular_data_plan_ = plan; 213 cellular_data_plan_ = plan;
213 } 214 }
214 215
215 } // namespace chromeos 216 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/native_dialog_window.cc ('k') | chrome/browser/chromeos/options/internet_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698