chrome/browser/ui/webui/options/browser_options_handler.h - Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory.

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/webui/options/browser_options_handler.h

Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to parent Created 8 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

« no previous file with comments | « chrome/browser/ui/webui/ntp/ntp_resource_cache.h ('k') | chrome/browser/ui/webui/options/chromeos/keyboard_handler.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_	5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_

6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_	6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_

7	7

8 #include "base/memory/ref_counted.h"	8 #include "base/memory/ref_counted.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/memory/weak_ptr.h"	10 #include "base/memory/weak_ptr.h"

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

12 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"	12 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"

13 #include "chrome/browser/search_engines/template_url_service_observer.h"	13 #include "chrome/browser/search_engines/template_url_service_observer.h"

14 #include "chrome/browser/shell_integration.h"	14 #include "chrome/browser/shell_integration.h"

15 #include "chrome/browser/sync/profile_sync_service_observer.h"	15 #include "chrome/browser/sync/profile_sync_service_observer.h"

16 #include "chrome/browser/ui/webui/options/options_ui.h"	16 #include "chrome/browser/ui/webui/options/options_ui.h"

17 #include "ui/base/dialogs/select_file_dialog.h"	17 #include "ui/base/dialogs/select_file_dialog.h"

18 #include "ui/base/models/table_model_observer.h"	18 #include "ui/base/models/table_model_observer.h"

19	19

20 #if defined(OS_CHROMEOS)	20 #if defined(OS_CHROMEOS)

21 #include "chrome/browser/chromeos/system/pointer_device_observer.h"	21 #include "chrome/browser/chromeos/system/pointer_device_observer.h"

(...skipping 295 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
317 #if !defined(OS_CHROMEOS)	317 #if !defined(OS_CHROMEOS)

318 scoped_ptr<PrefSetObserver> proxy_prefs_;	318 scoped_ptr<PrefSetObserver> proxy_prefs_;

319 #endif // !defined(OS_CHROMEOS)	319 #endif // !defined(OS_CHROMEOS)

320	320

321 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);	321 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);

322 };	322 };

323	323

324 } // namespace options	324 } // namespace options

325	325

326 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_	326 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_

OLD	NEW