OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/webui/options/chromeos/internet_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" |
6 | 6 |
7 #include <ctype.h> | 7 #include <ctype.h> |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <string> | 10 #include <string> |
(...skipping 19 matching lines...) Expand all Loading... | |
30 #include "chrome/browser/chromeos/options/network_config_view.h" | 30 #include "chrome/browser/chromeos/options/network_config_view.h" |
31 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 31 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
32 #include "chrome/browser/chromeos/sim_dialog_delegate.h" | 32 #include "chrome/browser/chromeos/sim_dialog_delegate.h" |
33 #include "chrome/browser/chromeos/status/network_menu_icon.h" | 33 #include "chrome/browser/chromeos/status/network_menu_icon.h" |
34 #include "chrome/browser/chromeos/user_cros_settings_provider.h" | 34 #include "chrome/browser/chromeos/user_cros_settings_provider.h" |
35 #include "chrome/browser/net/pref_proxy_config_tracker.h" | 35 #include "chrome/browser/net/pref_proxy_config_tracker.h" |
36 #include "chrome/browser/profiles/profile.h" | 36 #include "chrome/browser/profiles/profile.h" |
37 #include "chrome/browser/ui/browser.h" | 37 #include "chrome/browser/ui/browser.h" |
38 #include "chrome/browser/ui/browser_list.h" | 38 #include "chrome/browser/ui/browser_list.h" |
39 #include "chrome/browser/ui/browser_window.h" | 39 #include "chrome/browser/ui/browser_window.h" |
40 #include "chrome/browser/ui/dialog_style.h" | |
40 #include "chrome/browser/ui/views/window.h" | 41 #include "chrome/browser/ui/views/window.h" |
41 #include "chrome/browser/ui/webui/web_ui_util.h" | 42 #include "chrome/browser/ui/webui/web_ui_util.h" |
42 #include "chrome/common/chrome_notification_types.h" | 43 #include "chrome/common/chrome_notification_types.h" |
43 #include "chrome/common/chrome_switches.h" | 44 #include "chrome/common/chrome_switches.h" |
44 #include "chrome/common/time_format.h" | 45 #include "chrome/common/time_format.h" |
45 #include "content/public/browser/notification_service.h" | 46 #include "content/public/browser/notification_service.h" |
46 #include "grit/chromium_strings.h" | 47 #include "grit/chromium_strings.h" |
47 #include "grit/generated_resources.h" | 48 #include "grit/generated_resources.h" |
48 #include "grit/locale_settings.h" | 49 #include "grit/locale_settings.h" |
49 #include "grit/theme_resources.h" | 50 #include "grit/theme_resources.h" |
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
890 dictionary->SetBoolean("showBuyButton", true); | 891 dictionary->SetBoolean("showBuyButton", true); |
891 } else if (cellular->activation_state() != | 892 } else if (cellular->activation_state() != |
892 chromeos::ACTIVATION_STATE_ACTIVATING && | 893 chromeos::ACTIVATION_STATE_ACTIVATING && |
893 cellular->activation_state() != | 894 cellular->activation_state() != |
894 chromeos::ACTIVATION_STATE_ACTIVATED) { | 895 chromeos::ACTIVATION_STATE_ACTIVATED) { |
895 dictionary->SetBoolean("showActivateButton", true); | 896 dictionary->SetBoolean("showActivateButton", true); |
896 } | 897 } |
897 } | 898 } |
898 | 899 |
899 void InternetOptionsHandler::CreateModalPopup(views::WidgetDelegate* view) { | 900 void InternetOptionsHandler::CreateModalPopup(views::WidgetDelegate* view) { |
900 views::Widget* window = browser::CreateViewsWindow(GetNativeWindow(), view); | 901 views::Widget* window = browser::CreateViewsWindow(GetNativeWindow(), view, |
902 STYLE_GENERIC); | |
flackr
2011/11/21 20:43:31
One argument per line.
bshe
2011/11/22 16:26:24
Done.
| |
901 window->SetAlwaysOnTop(true); | 903 window->SetAlwaysOnTop(true); |
902 window->Show(); | 904 window->Show(); |
903 } | 905 } |
904 | 906 |
905 gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const { | 907 gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const { |
906 // TODO(beng): This is an improper direct dependency on Browser. Route this | 908 // TODO(beng): This is an improper direct dependency on Browser. Route this |
907 // through some sort of delegate. | 909 // through some sort of delegate. |
908 Browser* browser = | 910 Browser* browser = |
909 BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_)); | 911 BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_)); |
910 return browser->window()->GetNativeHandle(); | 912 return browser->window()->GetNativeHandle(); |
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1290 dictionary->Set("wirelessList", GetWirelessList()); | 1292 dictionary->Set("wirelessList", GetWirelessList()); |
1291 dictionary->Set("vpnList", GetVPNList()); | 1293 dictionary->Set("vpnList", GetVPNList()); |
1292 dictionary->Set("rememberedList", GetRememberedList()); | 1294 dictionary->Set("rememberedList", GetRememberedList()); |
1293 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available()); | 1295 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available()); |
1294 dictionary->SetBoolean("wifiBusy", cros_->wifi_busy()); | 1296 dictionary->SetBoolean("wifiBusy", cros_->wifi_busy()); |
1295 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled()); | 1297 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled()); |
1296 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available()); | 1298 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available()); |
1297 dictionary->SetBoolean("cellularBusy", cros_->cellular_busy()); | 1299 dictionary->SetBoolean("cellularBusy", cros_->cellular_busy()); |
1298 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled()); | 1300 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled()); |
1299 } | 1301 } |
OLD | NEW |