chrome/browser/chromeos/options/system_page_view.cc - Issue 3084006: Fix CrOS build.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/options/system_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

« chrome/browser/chromeos/options/settings_page_view.cc ('K') | « chrome/browser/chromeos/options/settings_page_view.cc ('k') | chrome/browser/chromeos/volume_bubble_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/system_page_view.h"	5 #include "chrome/browser/chromeos/options/system_page_view.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

	10 #include "app/l10n_util.h"

10 #include "app/combobox_model.h"	11 #include "app/combobox_model.h"

11 #include "base/stl_util-inl.h"	12 #include "base/stl_util-inl.h"

	13 #include "base/string_util.h"

12 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

13 #include "chrome/browser/chromeos/cros/cros_library.h"	15 #include "chrome/browser/chromeos/cros/cros_library.h"

14 #include "chrome/browser/chromeos/cros/system_library.h"	16 #include "chrome/browser/chromeos/cros/system_library.h"

15 #include "chrome/browser/chromeos/options/language_config_util.h"	17 #include "chrome/browser/chromeos/options/language_config_util.h"

16 #include "chrome/browser/chromeos/options/language_config_view.h"	18 #include "chrome/browser/chromeos/options/language_config_view.h"

17 #include "chrome/browser/chromeos/options/options_window_view.h"	19 #include "chrome/browser/chromeos/options/options_window_view.h"

18 #include "chrome/browser/pref_member.h"	20 #include "chrome/browser/pref_member.h"

19 #include "chrome/browser/profile.h"	21 #include "chrome/browser/profile.h"

20 #include "chrome/common/pref_names.h"	22 #include "chrome/common/pref_names.h"

21 #include "grit/generated_resources.h"	23 #include "grit/generated_resources.h"

(...skipping 501 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
523 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);	525 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);

524 layout->StartRow(0, single_column_view_set_id);	526 layout->StartRow(0, single_column_view_set_id);

525 layout->AddView(new LanguageSection(profile()));	527 layout->AddView(new LanguageSection(profile()));

526 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);	528 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);

527 layout->StartRow(0, single_column_view_set_id);	529 layout->StartRow(0, single_column_view_set_id);

528 layout->AddView(new AccessibilitySection(profile()));	530 layout->AddView(new AccessibilitySection(profile()));

529 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);	531 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);

530 }	532 }

531	533

532 } // namespace chromeos	534 } // namespace chromeos

OLD	NEW