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

Side by Side Diff: chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. Created 6 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/feedback/system_logs/log_sources/chrome_internal_log_so urce.h" 5 #include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_so urce.h"
6 6
7 #include "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/sys_info.h" 8 #include "base/sys_info.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 10 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
12 #include "chrome/browser/profiles/profile_manager.h" 11 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/browser/sync/about_sync_util.h" 12 #include "chrome/browser/sync/about_sync_util.h"
14 #include "chrome/browser/sync/profile_sync_service_factory.h" 13 #include "chrome/browser/sync/profile_sync_service_factory.h"
15 #include "chrome/common/chrome_version_info.h" 14 #include "chrome/common/chrome_version_info.h"
16 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
17 #include "extensions/browser/extension_system.h" 16 #include "extensions/browser/extension_registry.h"
18 #include "extensions/common/extension.h" 17 #include "extensions/common/extension.h"
19 #include "extensions/common/extension_set.h" 18 #include "extensions/common/extension_set.h"
20 19
21 20
22 namespace { 21 namespace {
23 22
24 const char kSyncDataKey[] = "about_sync_data"; 23 const char kSyncDataKey[] = "about_sync_data";
25 const char kExtensionsListKey[] = "extensions"; 24 const char kExtensionsListKey[] = "extensions";
26 const char kChromeVersionTag[] = "CHROME VERSION"; 25 const char kChromeVersionTag[] = "CHROME VERSION";
27 #if !defined(OS_CHROMEOS) 26 #if !defined(OS_CHROMEOS)
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 void ChromeInternalLogSource::PopulateExtensionInfoLogs( 101 void ChromeInternalLogSource::PopulateExtensionInfoLogs(
103 SystemLogsResponse* response) { 102 SystemLogsResponse* response) {
104 if (!ChromeMetricsServiceAccessor::IsCrashReportingEnabled()) 103 if (!ChromeMetricsServiceAccessor::IsCrashReportingEnabled())
105 return; 104 return;
106 105
107 Profile* primary_profile = 106 Profile* primary_profile =
108 g_browser_process->profile_manager()->GetPrimaryUserProfile(); 107 g_browser_process->profile_manager()->GetPrimaryUserProfile();
109 if (!primary_profile) 108 if (!primary_profile)
110 return; 109 return;
111 110
112 ExtensionService* service = 111 extensions::ExtensionRegistry* extension_registry =
113 extensions::ExtensionSystem::Get(primary_profile)->extension_service(); 112 extensions::ExtensionRegistry::Get(primary_profile);
114 if (!service)
115 return;
116
117 std::string extensions_list; 113 std::string extensions_list;
118 const extensions::ExtensionSet* extensions = service->extensions(); 114 for (const scoped_refptr<const extensions::Extension>& extension :
119 for (extensions::ExtensionSet::const_iterator it = extensions->begin(); 115 extension_registry->enabled_extensions()) {
120 it != extensions->end();
121 ++it) {
122 const extensions::Extension* extension = it->get();
123 if (extensions_list.empty()) { 116 if (extensions_list.empty()) {
124 extensions_list = extension->name(); 117 extensions_list = extension->name();
125 } else { 118 } else {
126 extensions_list += ",\n" + extension->name(); 119 extensions_list += ",\n" + extension->name();
127 } 120 }
128 } 121 }
129 if (!extensions_list.empty()) 122 if (!extensions_list.empty())
130 extensions_list += "\n"; 123 extensions_list += "\n";
131 124
132 if (!extensions_list.empty()) 125 if (!extensions_list.empty())
133 (*response)[kExtensionsListKey] = extensions_list; 126 (*response)[kExtensionsListKey] = extensions_list;
134 } 127 }
135 128
136 } // namespace system_logs 129 } // namespace system_logs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698