chrome/browser/chromeos/options/internet_page_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/internet_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

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

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

6	6

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

8	8

9 #include "app/l10n_util.h"	9 #include "app/l10n_util.h"

10 #include "app/resource_bundle.h"

11 #include "base/string_util.h"	10 #include "base/string_util.h"

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

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

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

15 #include "chrome/browser/chromeos/options/options_window_view.h"	14 #include "chrome/browser/chromeos/options/options_window_view.h"

16 #include "chrome/browser/chromeos/status/network_menu.h"	15 #include "chrome/browser/chromeos/status/network_menu.h"

17 #include "chrome/browser/ui/views/window.h"	16 #include "chrome/browser/ui/views/window.h"

18 #include "grit/generated_resources.h"	17 #include "grit/generated_resources.h"

19 #include "grit/theme_resources.h"	18 #include "grit/theme_resources.h"

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

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

21 #include "views/controls/combobox/combobox.h"	21 #include "views/controls/combobox/combobox.h"

22 #include "views/controls/image_view.h"	22 #include "views/controls/image_view.h"

23 #include "views/controls/scroll_view.h"	23 #include "views/controls/scroll_view.h"

24 #include "views/widget/widget.h"	24 #include "views/widget/widget.h"

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

26	26

27 namespace chromeos {	27 namespace chromeos {

28	28

29 ////////////////////////////////////////////////////////////////////////////////	29 ////////////////////////////////////////////////////////////////////////////////

(...skipping 557 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
587 scroll_view_->SetBounds(GetLocalBounds(false));	587 scroll_view_->SetBounds(GetLocalBounds(false));

588 scroll_view_->Layout();	588 scroll_view_->Layout();

589 }	589 }

590	590

591 void InternetPageView::InitControlLayout() {	591 void InternetPageView::InitControlLayout() {

592 AddChildView(scroll_view_);	592 AddChildView(scroll_view_);

593 scroll_view_->SetContents(contents_view_);	593 scroll_view_->SetContents(contents_view_);

594 }	594 }

595	595

596 } // namespace chromeos	596 } // namespace chromeos

OLD	NEW