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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.h

Issue 7553001: Revert 95009. Causing pyauto NTP test failures on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/ntp/app_launcher_handler.h
===================================================================
--- chrome/browser/ui/webui/ntp/app_launcher_handler.h (revision 95021)
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.h (working copy)
@@ -41,10 +41,10 @@
virtual ~AppLauncherHandler();
// Populate a dictionary with the information from an extension.
- static base::DictionaryValue* CreateAppInfo(
- const Extension* extension,
- const AppNotification* notification,
- ExtensionService* service);
+ static void CreateAppInfo(const Extension* extension,
+ const AppNotification* notification,
+ ExtensionService* service,
+ base::DictionaryValue* value);
// Callback for pings related to launching apps on the NTP.
static bool HandlePing(Profile* profile, const std::string& path);
@@ -148,8 +148,8 @@
history::FaviconData data);
// The apps are represented in the extensions model, which
- // outlives us since it's owned by our containing profile.
- ExtensionService* const extension_service_;
+ // outlives us since its owned by our containing profile.
+ ExtensionService* const extensions_service_;
// We monitor changes to the extension system so that we can reload the apps
// when necessary.
« no previous file with comments | « chrome/browser/ui/webui/extension_icon_source.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