OLD | NEW |
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 "base/utf_string_conversions.h" |
9 #include "chrome/browser/chromeos/options/cellular_config_view.h" | 10 #include "chrome/browser/chromeos/options/cellular_config_view.h" |
10 #include "chrome/browser/chromeos/options/ip_config_view.h" | 11 #include "chrome/browser/chromeos/options/ip_config_view.h" |
11 #include "chrome/browser/chromeos/options/wifi_config_view.h" | 12 #include "chrome/browser/chromeos/options/wifi_config_view.h" |
12 #include "grit/chromium_strings.h" | 13 #include "grit/chromium_strings.h" |
13 #include "grit/generated_resources.h" | 14 #include "grit/generated_resources.h" |
14 #include "grit/locale_settings.h" | 15 #include "grit/locale_settings.h" |
15 #include "views/grid_layout.h" | 16 #include "views/grid_layout.h" |
16 #include "views/standard_layout.h" | 17 #include "views/standard_layout.h" |
17 #include "views/widget/widget_gtk.h" | 18 #include "views/widget/widget_gtk.h" |
18 #include "views/window/window.h" | 19 #include "views/window/window.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 ipconfig_view_ = new IPConfigView(cellular_.device_path()); | 199 ipconfig_view_ = new IPConfigView(cellular_.device_path()); |
199 else | 200 else |
200 ipconfig_view_ = new IPConfigView(ethernet_.device_path()); | 201 ipconfig_view_ = new IPConfigView(ethernet_.device_path()); |
201 tabs_->AddTab( | 202 tabs_->AddTab( |
202 l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_IP_CONFIG), | 203 l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_IP_CONFIG), |
203 ipconfig_view_); | 204 ipconfig_view_); |
204 } | 205 } |
205 } | 206 } |
206 | 207 |
207 } // namespace chromeos | 208 } // namespace chromeos |
OLD | NEW |