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

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

Issue 3084006: Fix CrOS build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 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) 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/settings_page_view.h" 5 #include "chrome/browser/chromeos/options/settings_page_view.h"
6 6
7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h"
9 #include "base/string_util.h"
viettrungluu 2010/07/31 07:37:28 Is string_util.h really needed?
7 #include "gfx/skia_utils_gtk.h" 10 #include "gfx/skia_utils_gtk.h"
8 #include "views/controls/label.h" 11 #include "views/controls/label.h"
9 #include "views/fill_layout.h" 12 #include "views/fill_layout.h"
10 #include "views/widget/widget_gtk.h" 13 #include "views/widget/widget_gtk.h"
11 14
12 namespace chromeos { 15 namespace chromeos {
13 16
14 SettingsPageView::SettingsPageView(Profile* profile) 17 SettingsPageView::SettingsPageView(Profile* profile)
15 : OptionsPageView(profile) { 18 : OptionsPageView(profile) {
16 SetLayoutManager(new views::FillLayout()); 19 SetLayoutManager(new views::FillLayout());
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 GridLayout::USE_PREF, 0, 0); 88 GridLayout::USE_PREF, 0, 0);
86 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); 89 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
87 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, 90 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
88 GridLayout::USE_PREF, 0, 0); 91 GridLayout::USE_PREF, 0, 0);
89 92
90 InitContents(child_layout); 93 InitContents(child_layout);
91 layout->AddView(contents); 94 layout->AddView(contents);
92 } 95 }
93 96
94 } // namespace chromeos 97 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/language_config_util.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