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

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

Issue 2793393002: CrOS settings/metrics: Correctly store Subscriptions (Closed)
Patch Set: . Created 3 years, 8 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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 17 matching lines...) Expand all
28 #include "components/signin/core/common/signin_pref_names.h" 28 #include "components/signin/core/common/signin_pref_names.h"
29 #include "components/sync/driver/sync_service_observer.h" 29 #include "components/sync/driver/sync_service_observer.h"
30 #include "content/public/browser/notification_observer.h" 30 #include "content/public/browser/notification_observer.h"
31 #include "extensions/browser/extension_registry_observer.h" 31 #include "extensions/browser/extension_registry_observer.h"
32 #include "google_apis/gaia/google_service_auth_error.h" 32 #include "google_apis/gaia/google_service_auth_error.h"
33 #include "printing/features/features.h" 33 #include "printing/features/features.h"
34 #include "ui/base/models/table_model_observer.h" 34 #include "ui/base/models/table_model_observer.h"
35 #include "ui/shell_dialogs/select_file_dialog.h" 35 #include "ui/shell_dialogs/select_file_dialog.h"
36 36
37 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
38 #include "chrome/browser/chromeos/settings/cros_settings.h"
38 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 39 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
39 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 40 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
40 #include "components/user_manager/user_manager.h" 41 #include "components/user_manager/user_manager.h"
41 #else // defined(OS_CHROMEOS) 42 #else // defined(OS_CHROMEOS)
42 #include "chrome/browser/shell_integration.h" 43 #include "chrome/browser/shell_integration.h"
43 #endif // !defined(OS_CHROMEOS) 44 #endif // !defined(OS_CHROMEOS)
44 45
45 class TemplateURLService; 46 class TemplateURLService;
46 47
47 namespace base { 48 namespace base {
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 default_zoom_level_subscription_; 440 default_zoom_level_subscription_;
440 441
441 PrefChangeRegistrar profile_pref_registrar_; 442 PrefChangeRegistrar profile_pref_registrar_;
442 #if defined(OS_CHROMEOS) 443 #if defined(OS_CHROMEOS)
443 std::unique_ptr<policy::PolicyChangeRegistrar> policy_registrar_; 444 std::unique_ptr<policy::PolicyChangeRegistrar> policy_registrar_;
444 445
445 // Whether factory reset can be performed. 446 // Whether factory reset can be performed.
446 bool enable_factory_reset_; 447 bool enable_factory_reset_;
447 448
448 PrefChangeRegistrar local_state_pref_change_registrar_; 449 PrefChangeRegistrar local_state_pref_change_registrar_;
450
451 std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
452 system_timezone_policy_observer_;
449 #endif 453 #endif
450 454
451 ScopedObserver<SigninManagerBase, SigninManagerBase::Observer> 455 ScopedObserver<SigninManagerBase, SigninManagerBase::Observer>
452 signin_observer_; 456 signin_observer_;
453 457
454 // Used to get WeakPtr to self for use on the UI thread. 458 // Used to get WeakPtr to self for use on the UI thread.
455 base::WeakPtrFactory<BrowserOptionsHandler> weak_ptr_factory_; 459 base::WeakPtrFactory<BrowserOptionsHandler> weak_ptr_factory_;
456 460
457 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler); 461 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
458 }; 462 };
459 463
460 } // namespace options 464 } // namespace options
461 465
462 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ 466 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/metrics/metrics_reporting_state.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