| Index: chrome/browser/ui/webui/ntp/app_launcher_handler.h
|
| diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
|
| index 68ed8dc262514e2b3ed1fc4b2060873698a9a0d7..30a97cb532bdf71aa452c929dba37fc175d8f2d2 100644
|
| --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h
|
| +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
|
| @@ -41,22 +41,22 @@ class AppLauncherHandler : public WebUIMessageHandler,
|
| virtual ~AppLauncherHandler();
|
|
|
| // Populate a dictionary with the information from an extension.
|
| - static void CreateAppInfo(const Extension* extension,
|
| - const AppNotification* notification,
|
| - ExtensionService* service,
|
| - base::DictionaryValue* value);
|
| + static base::DictionaryValue* CreateAppInfo(
|
| + const Extension* extension,
|
| + const AppNotification* notification,
|
| + ExtensionService* service);
|
|
|
| // Callback for pings related to launching apps on the NTP.
|
| static bool HandlePing(Profile* profile, const std::string& path);
|
|
|
| // WebUIMessageHandler implementation.
|
| - virtual WebUIMessageHandler* Attach(WebUI* web_ui);
|
| - virtual void RegisterMessages();
|
| + virtual WebUIMessageHandler* Attach(WebUI* web_ui) OVERRIDE;
|
| + virtual void RegisterMessages() OVERRIDE;
|
|
|
| // NotificationObserver
|
| virtual void Observe(int type,
|
| const NotificationSource& source,
|
| - const NotificationDetails& details);
|
| + const NotificationDetails& details) OVERRIDE;
|
|
|
| // Populate the given dictionary with all installed app info.
|
| void FillAppDictionary(base::DictionaryValue* value);
|
| @@ -125,12 +125,12 @@ class AppLauncherHandler : public WebUIMessageHandler,
|
| void PromptToEnableApp(const std::string& extension_id);
|
|
|
| // ExtensionUninstallDialog::Delegate:
|
| - virtual void ExtensionDialogAccepted();
|
| - virtual void ExtensionDialogCanceled();
|
| + virtual void ExtensionDialogAccepted() OVERRIDE;
|
| + virtual void ExtensionDialogCanceled() OVERRIDE;
|
|
|
| // ExtensionInstallUI::Delegate:
|
| - virtual void InstallUIProceed();
|
| - virtual void InstallUIAbort(bool user_initiated);
|
| + virtual void InstallUIProceed() OVERRIDE;
|
| + virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
|
|
|
| // Returns the ExtensionUninstallDialog object for this class, creating it if
|
| // needed.
|
| @@ -148,8 +148,8 @@ class AppLauncherHandler : public WebUIMessageHandler,
|
| history::FaviconData data);
|
|
|
| // The apps are represented in the extensions model, which
|
| - // outlives us since its owned by our containing profile.
|
| - ExtensionService* const extensions_service_;
|
| + // outlives us since it's owned by our containing profile.
|
| + ExtensionService* const extension_service_;
|
|
|
| // We monitor changes to the extension system so that we can reload the apps
|
| // when necessary.
|
|
|