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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
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/chromeos/options/network_config_view.h" 5 #include "chrome/browser/chromeos/options/network_config_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/chromeos/options/vpn_config_view.h" 11 #include "chrome/browser/chromeos/options/vpn_config_view.h"
12 #include "chrome/browser/chromeos/options/wifi_config_view.h" 12 #include "chrome/browser/chromeos/options/wifi_config_view.h"
13 #include "grit/chromium_strings.h" 13 #include "grit/chromium_strings.h"
14 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
15 #include "grit/locale_settings.h" 15 #include "grit/locale_settings.h"
16 #include "ui/base/accessibility/accessible_view_state.h" 16 #include "ui/base/accessibility/accessible_view_state.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/gfx/rect.h" 18 #include "ui/gfx/rect.h"
19 #include "ui/views/layout/grid_layout.h" 19 #include "ui/views/layout/grid_layout.h"
20 #include "ui/views/layout/layout_constants.h" 20 #include "ui/views/layout/layout_constants.h"
21 #include "ui/views/widget/widget.h"
21 #include "views/controls/button/text_button.h" 22 #include "views/controls/button/text_button.h"
22 #include "views/widget/widget.h"
23 23
24 namespace chromeos { 24 namespace chromeos {
25 25
26 // static 26 // static
27 const int ChildNetworkConfigView::kInputFieldMinWidth = 270; 27 const int ChildNetworkConfigView::kInputFieldMinWidth = 270;
28 28
29 NetworkConfigView::NetworkConfigView(Network* network) 29 NetworkConfigView::NetworkConfigView(Network* network)
30 : delegate_(NULL), 30 : delegate_(NULL),
31 advanced_button_(NULL), 31 advanced_button_(NULL),
32 advanced_button_container_(NULL) { 32 advanced_button_container_(NULL) {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 181
182 int column_set_id = 0; 182 int column_set_id = 0;
183 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id); 183 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
184 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 184 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING,
185 0, views::GridLayout::USE_PREF, 0, 0); 185 0, views::GridLayout::USE_PREF, 0, 0);
186 layout->StartRow(0, column_set_id); 186 layout->StartRow(0, column_set_id);
187 layout->AddView(advanced_button_); 187 layout->AddView(advanced_button_);
188 } 188 }
189 189
190 } // namespace chromeos 190 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/notifications/notification_panel.cc ('k') | chrome/browser/chromeos/panels/panel_scroller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698