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

Side by Side Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 2053001: Fix crash when opening "Select certificate file" in OOBE. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: added correct way to check for OOBE/login mode Created 10 years, 7 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/options/network_config_view.h" 5 #include "chrome/browser/chromeos/options/network_config_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "chrome/browser/chromeos/options/ip_config_view.h" 9 #include "chrome/browser/chromeos/options/ip_config_view.h"
10 #include "chrome/browser/chromeos/options/wifi_config_view.h" 10 #include "chrome/browser/chromeos/options/wifi_config_view.h"
11 #include "grit/chromium_strings.h" 11 #include "grit/chromium_strings.h"
12 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
13 #include "grit/locale_settings.h" 13 #include "grit/locale_settings.h"
14 #include "views/grid_layout.h" 14 #include "views/grid_layout.h"
15 #include "views/standard_layout.h" 15 #include "views/standard_layout.h"
16 #include "views/widget/widget_gtk.h"
16 #include "views/window/window.h" 17 #include "views/window/window.h"
17 18
19 using views::WidgetGtk;
20
18 namespace chromeos { 21 namespace chromeos {
19 22
20 NetworkConfigView::NetworkConfigView(EthernetNetwork ethernet) 23 NetworkConfigView::NetworkConfigView(EthernetNetwork ethernet)
21 : flags_(FLAG_ETHERNET | FLAG_SHOW_IPCONFIG), 24 : browser_mode_(true),
25 flags_(FLAG_ETHERNET | FLAG_SHOW_IPCONFIG),
22 ethernet_(ethernet), 26 ethernet_(ethernet),
23 wificonfig_view_(NULL), 27 wificonfig_view_(NULL),
24 ipconfig_view_(NULL) { 28 ipconfig_view_(NULL) {
25 } 29 }
26 30
27 NetworkConfigView::NetworkConfigView(WifiNetwork wifi, bool login_only) 31 NetworkConfigView::NetworkConfigView(WifiNetwork wifi, bool login_only)
28 : flags_(FLAG_WIFI), 32 : browser_mode_(true),
33 flags_(FLAG_WIFI),
29 wifi_(wifi), 34 wifi_(wifi),
30 wificonfig_view_(NULL), 35 wificonfig_view_(NULL),
31 ipconfig_view_(NULL) { 36 ipconfig_view_(NULL) {
32 if (login_only) 37 if (login_only)
33 flags_ |= FLAG_LOGIN_ONLY; 38 flags_ |= FLAG_LOGIN_ONLY;
34 else 39 else
35 flags_ |= FLAG_SHOW_IPCONFIG; 40 flags_ |= FLAG_SHOW_IPCONFIG;
36 } 41 }
37 42
38 NetworkConfigView::NetworkConfigView(CellularNetwork cellular) 43 NetworkConfigView::NetworkConfigView(CellularNetwork cellular)
39 : flags_(FLAG_CELLULAR | FLAG_SHOW_IPCONFIG), 44 : browser_mode_(true),
45 flags_(FLAG_CELLULAR | FLAG_SHOW_IPCONFIG),
40 cellular_(cellular), 46 cellular_(cellular),
41 wificonfig_view_(NULL), 47 wificonfig_view_(NULL),
42 ipconfig_view_(NULL) { 48 ipconfig_view_(NULL) {
43 } 49 }
44 50
45 NetworkConfigView::NetworkConfigView() 51 NetworkConfigView::NetworkConfigView()
46 : flags_(FLAG_WIFI | FLAG_LOGIN_ONLY | FLAG_OTHER_NETWORK), 52 : browser_mode_(true),
53 flags_(FLAG_WIFI | FLAG_LOGIN_ONLY | FLAG_OTHER_NETWORK),
47 wificonfig_view_(NULL), 54 wificonfig_view_(NULL),
48 ipconfig_view_(NULL) { 55 ipconfig_view_(NULL) {
49 } 56 }
50 57
58 gfx::NativeWindow NetworkConfigView::GetNativeWindow() const {
59 return GTK_WINDOW(static_cast<WidgetGtk*>(GetWidget())->GetNativeView());
60 }
61
51 std::wstring NetworkConfigView::GetDialogButtonLabel( 62 std::wstring NetworkConfigView::GetDialogButtonLabel(
52 MessageBoxFlags::DialogButton button) const { 63 MessageBoxFlags::DialogButton button) const {
53 if (button == MessageBoxFlags::DIALOGBUTTON_OK) { 64 if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
54 if (flags_ & FLAG_LOGIN_ONLY) 65 if (flags_ & FLAG_LOGIN_ONLY)
55 return l10n_util::GetString(IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN); 66 return l10n_util::GetString(IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN);
56 else 67 else
57 return l10n_util::GetString(IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DONE); 68 return l10n_util::GetString(IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DONE);
58 } 69 }
59 return L""; 70 return L"";
60 } 71 }
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 ipconfig_view_ = new IPConfigView(cellular_.device_path()); 151 ipconfig_view_ = new IPConfigView(cellular_.device_path());
141 else 152 else
142 ipconfig_view_ = new IPConfigView(ethernet_.device_path()); 153 ipconfig_view_ = new IPConfigView(ethernet_.device_path());
143 tabs_->AddTab( 154 tabs_->AddTab(
144 l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_IP_CONFIG), 155 l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_IP_CONFIG),
145 ipconfig_view_); 156 ipconfig_view_);
146 } 157 }
147 } 158 }
148 159
149 } // namespace chromeos 160 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698