OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/ip_config_view.h" | 5 #include "chrome/browser/chromeos/options/ip_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/cros/cros_library.h" | 10 #include "chrome/browser/chromeos/cros/cros_library.h" |
10 #include "grit/chromium_strings.h" | 11 #include "grit/chromium_strings.h" |
11 #include "grit/generated_resources.h" | 12 #include "grit/generated_resources.h" |
12 #include "grit/locale_settings.h" | 13 #include "grit/locale_settings.h" |
13 #include "views/controls/label.h" | 14 #include "views/controls/label.h" |
14 #include "views/controls/textfield/textfield.h" | 15 #include "views/controls/textfield/textfield.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/window/window.h" | 18 #include "views/window/window.h" |
18 | 19 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 layout->StartRow(0, column_view_set_id); | 81 layout->StartRow(0, column_view_set_id); |
81 layout->AddView(new views::Label(l10n_util::GetString( | 82 layout->AddView(new views::Label(l10n_util::GetString( |
82 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER))); | 83 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER))); |
83 dnsserver_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT); | 84 dnsserver_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT); |
84 dnsserver_textfield_->SetEnabled(false); | 85 dnsserver_textfield_->SetEnabled(false); |
85 layout->AddView(dnsserver_textfield_); | 86 layout->AddView(dnsserver_textfield_); |
86 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 87 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
87 } | 88 } |
88 | 89 |
89 } // namespace chromeos | 90 } // namespace chromeos |
OLD | NEW |