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

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

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

Powered by Google App Engine
This is Rietveld 408576698