| 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 #include "chrome/browser/extensions/api/preference/preference_helpers.h" | 5 #include "chrome/browser/extensions/api/preference/preference_helpers.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
| 8 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| 9 #include "base/values.h" | 11 #include "base/values.h" |
| 10 #include "chrome/browser/extensions/api/preference/preference_api.h" | 12 #include "chrome/browser/extensions/api/preference/preference_api.h" |
| 11 #include "chrome/browser/extensions/extension_util.h" | 13 #include "chrome/browser/extensions/extension_util.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 13 #include "extensions/browser/event_router.h" | 15 #include "extensions/browser/event_router.h" |
| 14 #include "extensions/browser/extension_prefs.h" | 16 #include "extensions/browser/extension_prefs.h" |
| 15 #include "extensions/browser/extension_registry.h" | 17 #include "extensions/browser/extension_registry.h" |
| 16 #include "extensions/common/manifest_handlers/incognito_info.h" | 18 #include "extensions/common/manifest_handlers/incognito_info.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 } else if (!incognito && | 122 } else if (!incognito && |
| 121 PreferenceAPI::Get(profile)->DoesExtensionControlPref( | 123 PreferenceAPI::Get(profile)->DoesExtensionControlPref( |
| 122 extension->id(), browser_pref, &from_incognito) && | 124 extension->id(), browser_pref, &from_incognito) && |
| 123 from_incognito) { | 125 from_incognito) { |
| 124 restrict_to_profile = profile; | 126 restrict_to_profile = profile; |
| 125 } | 127 } |
| 126 } | 128 } |
| 127 | 129 |
| 128 scoped_ptr<base::ListValue> args_copy(args->DeepCopy()); | 130 scoped_ptr<base::ListValue> args_copy(args->DeepCopy()); |
| 129 scoped_ptr<Event> event( | 131 scoped_ptr<Event> event( |
| 130 new Event(histogram_value, event_name, args_copy.Pass())); | 132 new Event(histogram_value, event_name, std::move(args_copy))); |
| 131 event->restrict_to_browser_context = restrict_to_profile; | 133 event->restrict_to_browser_context = restrict_to_profile; |
| 132 router->DispatchEventToExtension(extension->id(), event.Pass()); | 134 router->DispatchEventToExtension(extension->id(), std::move(event)); |
| 133 } | 135 } |
| 134 } | 136 } |
| 135 } | 137 } |
| 136 | 138 |
| 137 } // namespace preference_helpers | 139 } // namespace preference_helpers |
| 138 } // namespace extensions | 140 } // namespace extensions |
| OLD | NEW |