chrome/browser/ui/views/options/fonts_page_view.h - Issue 6485017: Carnitas: move browser/ui/shell_dialogs.{h,cc} to browser/ui

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/ui/views/options/fonts_page_view.h

Issue 6485017: Carnitas: move browser/ui/shell_dialogs.{h,cc} to browser/ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 2 more cases Created 9 years, 10 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/ui/views/options/advanced_contents_view.cc ('k') | chrome/browser/ui/views/options/fonts_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 #ifndef CHROME_BROWSER_UI_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_

6 #define CHROME_BROWSER_UI_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_	6 #define CHROME_BROWSER_UI_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_

7 #pragma once	7 #pragma once

8	8

9 #include <string>	9 #include <string>

10	10

11 #include "chrome/browser/prefs/pref_member.h"	11 #include "chrome/browser/prefs/pref_member.h"

12 #include "chrome/browser/shell_dialogs.h"	12 #include "chrome/browser/ui/shell_dialogs.h"

13 #include "chrome/browser/ui/views/options/options_page_view.h"	13 #include "chrome/browser/ui/views/options/options_page_view.h"

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

15 #include "views/controls/button/button.h"	15 #include "views/controls/button/button.h"

16 #include "views/view.h"	16 #include "views/view.h"

17	17

18 class DefaultEncodingComboboxModel;	18 class DefaultEncodingComboboxModel;

19 class FontDisplayView;	19 class FontDisplayView;

20	20

21 namespace views {	21 namespace views {

22 class GroupboxView;	22 class GroupboxView;

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 scoped_ptr<DefaultEncodingComboboxModel> default_encoding_combobox_model_;	120 scoped_ptr<DefaultEncodingComboboxModel> default_encoding_combobox_model_;

121 views::Label* default_encoding_combobox_label_;	121 views::Label* default_encoding_combobox_label_;

122 views::Combobox* default_encoding_combobox_;	122 views::Combobox* default_encoding_combobox_;

123 std::string default_encoding_selected_;	123 std::string default_encoding_selected_;

124 bool default_encoding_changed_;	124 bool default_encoding_changed_;

125	125

126 DISALLOW_COPY_AND_ASSIGN(FontsPageView);	126 DISALLOW_COPY_AND_ASSIGN(FontsPageView);

127 };	127 };

128	128

129 #endif // CHROME_BROWSER_UI_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_	129 #endif // CHROME_BROWSER_UI_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_

OLD	NEW