Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.h

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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
OLDNEW
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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/prefs/pref_change_registrar.h" 15 #include "base/prefs/pref_change_registrar.h"
16 #include "base/prefs/pref_member.h" 16 #include "base/prefs/pref_member.h"
17 #include "base/scoped_observer.h" 17 #include "base/scoped_observer.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/profiles/profile_info_cache_observer.h" 19 #include "chrome/browser/profiles/profile_info_cache_observer.h"
20 #include "chrome/browser/shell_integration.h" 20 #include "chrome/browser/shell_integration.h"
21 #include "chrome/browser/ui/host_desktop.h"
22 #include "chrome/browser/ui/webui/options/options_ui.h" 21 #include "chrome/browser/ui/webui/options/options_ui.h"
23 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" 22 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
24 #include "components/policy/core/common/policy_service.h" 23 #include "components/policy/core/common/policy_service.h"
25 #include "components/search_engines/template_url_service_observer.h" 24 #include "components/search_engines/template_url_service_observer.h"
26 #include "components/signin/core/browser/signin_manager_base.h" 25 #include "components/signin/core/browser/signin_manager_base.h"
27 #include "components/sync_driver/sync_service_observer.h" 26 #include "components/sync_driver/sync_service_observer.h"
28 #include "content/public/browser/notification_observer.h" 27 #include "content/public/browser/notification_observer.h"
29 #include "extensions/browser/extension_registry_observer.h" 28 #include "extensions/browser/extension_registry_observer.h"
30 #include "google_apis/gaia/google_service_auth_error.h" 29 #include "google_apis/gaia/google_service_auth_error.h"
31 #include "ui/base/models/table_model_observer.h" 30 #include "ui/base/models/table_model_observer.h"
31 #include "ui/gfx/host_desktop_type.h"
32 #include "ui/shell_dialogs/select_file_dialog.h" 32 #include "ui/shell_dialogs/select_file_dialog.h"
33 33
34 #if defined(OS_CHROMEOS) 34 #if defined(OS_CHROMEOS)
35 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 35 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
36 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 36 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
37 #endif // defined(OS_CHROMEOS) 37 #endif // defined(OS_CHROMEOS)
38 38
39 class AutocompleteController; 39 class AutocompleteController;
40 class CloudPrintSetupHandler; 40 class CloudPrintSetupHandler;
41 class CustomHomePagesTableModel; 41 class CustomHomePagesTableModel;
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 417
418 // Used to get WeakPtr to self for use on the UI thread. 418 // Used to get WeakPtr to self for use on the UI thread.
419 base::WeakPtrFactory<BrowserOptionsHandler> weak_ptr_factory_; 419 base::WeakPtrFactory<BrowserOptionsHandler> weak_ptr_factory_;
420 420
421 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler); 421 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
422 }; 422 };
423 423
424 } // namespace options 424 } // namespace options
425 425
426 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ 426 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698