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

Side by Side Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 16248002: Move Extension::GetBasicInfo to a static helper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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/ui/webui/net_internals/net_internals_ui.h" 5 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 24 matching lines...) Expand all
35 #include "chrome/browser/extensions/extension_service.h" 35 #include "chrome/browser/extensions/extension_service.h"
36 #include "chrome/browser/extensions/extension_system.h" 36 #include "chrome/browser/extensions/extension_system.h"
37 #include "chrome/browser/io_thread.h" 37 #include "chrome/browser/io_thread.h"
38 #include "chrome/browser/net/chrome_net_log.h" 38 #include "chrome/browser/net/chrome_net_log.h"
39 #include "chrome/browser/net/chrome_network_delegate.h" 39 #include "chrome/browser/net/chrome_network_delegate.h"
40 #include "chrome/browser/net/connection_tester.h" 40 #include "chrome/browser/net/connection_tester.h"
41 #include "chrome/browser/net/url_fixer_upper.h" 41 #include "chrome/browser/net/url_fixer_upper.h"
42 #include "chrome/browser/prerender/prerender_manager.h" 42 #include "chrome/browser/prerender/prerender_manager.h"
43 #include "chrome/browser/prerender/prerender_manager_factory.h" 43 #include "chrome/browser/prerender/prerender_manager_factory.h"
44 #include "chrome/browser/profiles/profile.h" 44 #include "chrome/browser/profiles/profile.h"
45 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
45 #include "chrome/common/cancelable_task_tracker.h" 46 #include "chrome/common/cancelable_task_tracker.h"
46 #include "chrome/common/chrome_notification_types.h" 47 #include "chrome/common/chrome_notification_types.h"
47 #include "chrome/common/chrome_paths.h" 48 #include "chrome/common/chrome_paths.h"
48 #include "chrome/common/chrome_version_info.h" 49 #include "chrome/common/chrome_version_info.h"
49 #include "chrome/common/extensions/extension_set.h" 50 #include "chrome/common/extensions/extension_set.h"
50 #include "chrome/common/logging_chrome.h" 51 #include "chrome/common/logging_chrome.h"
51 #include "chrome/common/pref_names.h" 52 #include "chrome/common/pref_names.h"
52 #include "chrome/common/url_constants.h" 53 #include "chrome/common/url_constants.h"
53 #include "content/public/browser/browser_thread.h" 54 #include "content/public/browser/browser_thread.h"
54 #include "content/public/browser/notification_details.h" 55 #include "content/public/browser/notification_details.h"
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 extensions::ExtensionSystem::Get(profile); 902 extensions::ExtensionSystem::Get(profile);
902 if (extension_system) { 903 if (extension_system) {
903 ExtensionService* extension_service = extension_system->extension_service(); 904 ExtensionService* extension_service = extension_system->extension_service();
904 if (extension_service) { 905 if (extension_service) {
905 scoped_ptr<const ExtensionSet> extensions( 906 scoped_ptr<const ExtensionSet> extensions(
906 extension_service->GenerateInstalledExtensionsSet()); 907 extension_service->GenerateInstalledExtensionsSet());
907 for (ExtensionSet::const_iterator it = extensions->begin(); 908 for (ExtensionSet::const_iterator it = extensions->begin();
908 it != extensions->end(); ++it) { 909 it != extensions->end(); ++it) {
909 DictionaryValue* extension_info = new DictionaryValue(); 910 DictionaryValue* extension_info = new DictionaryValue();
910 bool enabled = extension_service->IsExtensionEnabled((*it)->id()); 911 bool enabled = extension_service->IsExtensionEnabled((*it)->id());
911 (*it)->GetBasicInfo(enabled, extension_info); 912 extensions::GetExtensionBasicInfo(*it, enabled, extension_info);
912 extension_list->Append(extension_info); 913 extension_list->Append(extension_info);
913 } 914 }
914 } 915 }
915 } 916 }
916 SendJavascriptCommand("receivedExtensionInfo", extension_list); 917 SendJavascriptCommand("receivedExtensionInfo", extension_list);
917 } 918 }
918 919
919 #if defined(OS_CHROMEOS) 920 #if defined(OS_CHROMEOS)
920 //////////////////////////////////////////////////////////////////////////////// 921 ////////////////////////////////////////////////////////////////////////////////
921 // 922 //
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1995 } 1996 }
1996 1997
1997 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1998 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1998 : WebUIController(web_ui) { 1999 : WebUIController(web_ui) {
1999 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 2000 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
2000 2001
2001 // Set up the chrome://net-internals/ source. 2002 // Set up the chrome://net-internals/ source.
2002 Profile* profile = Profile::FromWebUI(web_ui); 2003 Profile* profile = Profile::FromWebUI(web_ui);
2003 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource()); 2004 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
2004 } 2005 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698