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

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

Issue 1241453005: ChromeOS: Time zone setting dropdown should be grayed out once we enable the Automatically resolve … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 const extensions::Extension* extension) override; 102 const extensions::Extension* extension) override;
103 void OnExtensionUnloaded( 103 void OnExtensionUnloaded(
104 content::BrowserContext* browser_context, 104 content::BrowserContext* browser_context,
105 const extensions::Extension* extension, 105 const extensions::Extension* extension,
106 extensions::UnloadedExtensionInfo::Reason reason) override; 106 extensions::UnloadedExtensionInfo::Reason reason) override;
107 107
108 // policy::PolicyService::Observer: 108 // policy::PolicyService::Observer:
109 void OnPolicyUpdated(const policy::PolicyNamespace& ns, 109 void OnPolicyUpdated(const policy::PolicyNamespace& ns,
110 const policy::PolicyMap& previous, 110 const policy::PolicyMap& previous,
111 const policy::PolicyMap& current) override; 111 const policy::PolicyMap& current) override;
112
112 private: 113 private:
113 // content::NotificationObserver implementation. 114 // content::NotificationObserver implementation.
114 void Observe(int type, 115 void Observe(int type,
115 const content::NotificationSource& source, 116 const content::NotificationSource& source,
116 const content::NotificationDetails& details) override; 117 const content::NotificationDetails& details) override;
117 118
118 // ProfileInfoCacheObserver implementation. 119 // ProfileInfoCacheObserver implementation.
119 void OnProfileAdded(const base::FilePath& profile_path) override; 120 void OnProfileAdded(const base::FilePath& profile_path) override;
120 void OnProfileWasRemoved(const base::FilePath& profile_path, 121 void OnProfileWasRemoved(const base::FilePath& profile_path,
121 const base::string16& profile_name) override; 122 const base::string16& profile_name) override;
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 377
377 // Notifies the result of MetricsReportingEnabled change to Javascript layer. 378 // Notifies the result of MetricsReportingEnabled change to Javascript layer.
378 void MetricsReportingChangeCallback(bool enabled); 379 void MetricsReportingChangeCallback(bool enabled);
379 380
380 // Calls a Javascript function to set the state of MetricsReporting checkbox. 381 // Calls a Javascript function to set the state of MetricsReporting checkbox.
381 void SetMetricsReportingCheckbox(bool checked, bool disabled); 382 void SetMetricsReportingCheckbox(bool checked, bool disabled);
382 383
383 #if defined(OS_CHROMEOS) 384 #if defined(OS_CHROMEOS)
384 // Setup the accessibility features for ChromeOS. 385 // Setup the accessibility features for ChromeOS.
385 void SetupAccessibilityFeatures(); 386 void SetupAccessibilityFeatures();
387
388 // Updates TimeZone options section for ChromeOS.
389 void OnResolveTimezoneByGeolocationChanged();
386 #endif 390 #endif
387 391
388 // Returns a newly created dictionary with a number of properties that 392 // Returns a newly created dictionary with a number of properties that
389 // correspond to the status of sync. 393 // correspond to the status of sync.
390 scoped_ptr<base::DictionaryValue> GetSyncStateDictionary(); 394 scoped_ptr<base::DictionaryValue> GetSyncStateDictionary();
391 395
392 scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_; 396 scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
393 397
394 bool page_initialized_; 398 bool page_initialized_;
395 399
(...skipping 21 matching lines...) Expand all
417 421
418 // Used to get WeakPtr to self for use on the UI thread. 422 // Used to get WeakPtr to self for use on the UI thread.
419 base::WeakPtrFactory<BrowserOptionsHandler> weak_ptr_factory_; 423 base::WeakPtrFactory<BrowserOptionsHandler> weak_ptr_factory_;
420 424
421 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler); 425 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
422 }; 426 };
423 427
424 } // namespace options 428 } // namespace options
425 429
426 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ 430 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698