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

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

Issue 6257017: views: Move standard_layout.h into the layout directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 9 years, 11 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 | 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/settings_page_view.h" 5 #include "chrome/browser/chromeos/options/settings_page_view.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "gfx/skia_utils_gtk.h" 9 #include "gfx/skia_utils_gtk.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
11 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
12 #include "views/controls/label.h" 12 #include "views/controls/label.h"
13 #include "views/layout/fill_layout.h" 13 #include "views/layout/fill_layout.h"
14 #include "views/layout/layout_constants.h"
14 #include "views/widget/widget_gtk.h" 15 #include "views/widget/widget_gtk.h"
15 16
16 namespace chromeos { 17 namespace chromeos {
17 18
18 SettingsPageView::SettingsPageView(Profile* profile) 19 SettingsPageView::SettingsPageView(Profile* profile)
19 : OptionsPageView(profile) { 20 : OptionsPageView(profile) {
20 SetLayoutManager(new views::FillLayout()); 21 SetLayoutManager(new views::FillLayout());
21 } 22 }
22 23
23 GtkWidget* SettingsPageView::WrapInGtkWidget() { 24 GtkWidget* SettingsPageView::WrapInGtkWidget() {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 GridLayout::USE_PREF, 0, 0); 90 GridLayout::USE_PREF, 0, 0);
90 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); 91 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
91 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, 92 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
92 GridLayout::USE_PREF, 0, 0); 93 GridLayout::USE_PREF, 0, 0);
93 94
94 InitContents(child_layout); 95 InitContents(child_layout);
95 layout->AddView(contents); 96 layout->AddView(contents);
96 } 97 }
97 98
98 } // namespace chromeos 99 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/settings_page_view.h ('k') | chrome/browser/chromeos/options/system_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698