chrome/browser/chromeos/options/wifi_config_view.cc - Issue 6263008: Move ResourceBundle, DataPack to ui/base

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/wifi_config_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

« no previous file with comments | « chrome/browser/chromeos/options/settings_page_view.cc ('k') | chrome/browser/chromeos/panels/panel_scroller_header.cc » ('j') | no next file with comments »

OLD	NEW
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/wifi_config_view.h"	5 #include "chrome/browser/chromeos/options/wifi_config_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 "chrome/browser/chromeos/cros/cros_library.h"	10 #include "chrome/browser/chromeos/cros/cros_library.h"

12 #include "chrome/browser/chromeos/login/user_manager.h"	11 #include "chrome/browser/chromeos/login/user_manager.h"

13 #include "chrome/browser/chromeos/options/network_config_view.h"	12 #include "chrome/browser/chromeos/options/network_config_view.h"

14 #include "grit/chromium_strings.h"	13 #include "grit/chromium_strings.h"

15 #include "grit/generated_resources.h"	14 #include "grit/generated_resources.h"

16 #include "grit/locale_settings.h"	15 #include "grit/locale_settings.h"

17 #include "grit/theme_resources.h"	16 #include "grit/theme_resources.h"

	17 #include "ui/base/resource/resource_bundle.h"

18 #include "views/controls/button/image_button.h"	18 #include "views/controls/button/image_button.h"

19 #include "views/controls/button/native_button.h"	19 #include "views/controls/button/native_button.h"

20 #include "views/controls/label.h"	20 #include "views/controls/label.h"

21 #include "views/grid_layout.h"	21 #include "views/grid_layout.h"

22 #include "views/standard_layout.h"	22 #include "views/standard_layout.h"

23 #include "views/window/window.h"	23 #include "views/window/window.h"

24	24

25 namespace chromeos {	25 namespace chromeos {

26	26

27 // The width of the password field.	27 // The width of the password field.

(...skipping 380 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
408 error_label_ = new views::Label();	408 error_label_ = new views::Label();

409 error_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);	409 error_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

410 error_label_->SetColor(SK_ColorRED);	410 error_label_->SetColor(SK_ColorRED);

411 layout->AddView(error_label_);	411 layout->AddView(error_label_);

412 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);	412 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);

413 // Set or hide the error text.	413 // Set or hide the error text.

414 UpdateErrorLabel(false);	414 UpdateErrorLabel(false);

415 }	415 }

416	416

417 } // namespace chromeos	417 } // namespace chromeos

OLD	NEW