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

Side by Side Diff: chrome/browser/extensions/api/preference/preference_api.cc

Issue 671783002: Reverting instrumentations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 #include "chrome/browser/extensions/api/preference/preference_api.h" 5 #include "chrome/browser/extensions/api/preference/preference_api.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/profiler/scoped_profile.h"
14 #include "base/stl_util.h" 13 #include "base/stl_util.h"
15 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
16 #include "base/values.h" 15 #include "base/values.h"
17 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
18 #include "chrome/browser/extensions/api/content_settings/content_settings_servic e.h" 17 #include "chrome/browser/extensions/api/content_settings/content_settings_servic e.h"
19 #include "chrome/browser/extensions/api/preference/preference_api_constants.h" 18 #include "chrome/browser/extensions/api/preference/preference_api_constants.h"
20 #include "chrome/browser/extensions/api/preference/preference_helpers.h" 19 #include "chrome/browser/extensions/api/preference/preference_helpers.h"
21 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 20 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
22 #include "chrome/browser/extensions/extension_service.h" 21 #include "chrome/browser/extensions/extension_service.h"
23 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 PreferenceAPI::GetFactoryInstance() { 442 PreferenceAPI::GetFactoryInstance() {
444 return g_factory.Pointer(); 443 return g_factory.Pointer();
445 } 444 }
446 445
447 // static 446 // static
448 PreferenceAPI* PreferenceAPI::Get(content::BrowserContext* context) { 447 PreferenceAPI* PreferenceAPI::Get(content::BrowserContext* context) {
449 return BrowserContextKeyedAPIFactory<PreferenceAPI>::Get(context); 448 return BrowserContextKeyedAPIFactory<PreferenceAPI>::Get(context);
450 } 449 }
451 450
452 void PreferenceAPI::OnListenerAdded(const EventListenerInfo& details) { 451 void PreferenceAPI::OnListenerAdded(const EventListenerInfo& details) {
453 // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed.
454 tracked_objects::ScopedProfile tracking_profile(
455 FROM_HERE_WITH_EXPLICIT_FUNCTION("PreferenceAPI::OnListenerAdded"));
456
457 preference_event_router_.reset(new PreferenceEventRouter(profile_)); 452 preference_event_router_.reset(new PreferenceEventRouter(profile_));
458 EventRouter::Get(profile_)->UnregisterObserver(this); 453 EventRouter::Get(profile_)->UnregisterObserver(this);
459 } 454 }
460 455
461 void PreferenceAPI::OnContentSettingChanged(const std::string& extension_id, 456 void PreferenceAPI::OnContentSettingChanged(const std::string& extension_id,
462 bool incognito) { 457 bool incognito) {
463 if (incognito) { 458 if (incognito) {
464 extension_prefs()->UpdateExtensionPref( 459 extension_prefs()->UpdateExtensionPref(
465 extension_id, 460 extension_id,
466 pref_names::kPrefIncognitoContentSettings, 461 pref_names::kPrefIncognitoContentSettings,
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 pref_key, PreferenceFunction::PERMISSION_TYPE_WRITE, &browser_pref)) { 712 pref_key, PreferenceFunction::PERMISSION_TYPE_WRITE, &browser_pref)) {
718 return false; 713 return false;
719 } 714 }
720 715
721 PreferenceAPI::Get(GetProfile()) 716 PreferenceAPI::Get(GetProfile())
722 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); 717 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
723 return true; 718 return true;
724 } 719 }
725 720
726 } // namespace extensions 721 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698