Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / background / background_contents_service.h

diff --git a/src/chrome/browser/background/background_contents_service.h b/src/chrome/browser/background/background_contents_service.h
index d9f859d..382cb42 100644 (file)
--- a/src/chrome/browser/background/background_contents_service.h
+++ b/src/chrome/browser/background/background_contents_service.h
@@ -59,15 +59,15 @@ class BackgroundContentsService : private content::NotificationObserver,
  public:
   BackgroundContentsService(Profile* profile,
                             const base::CommandLine* command_line);
-  virtual ~BackgroundContentsService();
+  ~BackgroundContentsService() override;
 
   // Allows tests to reduce the time between a force-installed app/extension
   // crashing and when we reload it.
   static void SetRestartDelayForForceInstalledAppsAndExtensionsForTesting(
       int restart_delay_in_ms);
 
-  // Get the crash notification's id for the extension.
-  static std::string GetNotificationIdForExtensionForTesting(
+  // Get the crash notification's delegate id for the extension.
+  static std::string GetNotificationDelegateIdForExtensionForTesting(
       const std::string& extension_id);
 
   // Show a popup notification balloon with a crash message for a given app/
@@ -89,11 +89,11 @@ class BackgroundContentsService : private content::NotificationObserver,
   std::vector<BackgroundContents*> GetBackgroundContents() const;
 
   // BackgroundContents::Delegate implementation.
-  virtual void AddWebContents(content::WebContents* new_contents,
-                              WindowOpenDisposition disposition,
-                              const gfx::Rect& initial_pos,
-                              bool user_gesture,
-                              bool* was_blocked) OVERRIDE;
+  void AddWebContents(content::WebContents* new_contents,
+                      WindowOpenDisposition disposition,
+                      const gfx::Rect& initial_pos,
+                      bool user_gesture,
+                      bool* was_blocked) override;
 
   // Gets the parent application id for the passed BackgroundContents. Returns
   // an empty string if no parent application found (e.g. passed
@@ -140,22 +140,20 @@ class BackgroundContentsService : private content::NotificationObserver,
   void StartObserving(Profile* profile);
 
   // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // extensions::ExtensionRegistryObserver implementation.
-  virtual void OnExtensionLoaded(
-      content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
-  virtual void OnExtensionUnloaded(
-      content::BrowserContext* browser_context,
-      const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
-  virtual void OnExtensionUninstalled(
+  void OnExtensionLoaded(content::BrowserContext* browser_context,
+                         const extensions::Extension* extension) override;
+  void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UninstallReason reason) OVERRIDE;
+      extensions::UnloadedExtensionInfo::Reason reason) override;
+  void OnExtensionUninstalled(content::BrowserContext* browser_context,
+                              const extensions::Extension* extension,
+                              extensions::UninstallReason reason) override;
 
   // Restarts a force-installed app/extension after a crash.
   void RestartForceInstalledExtensionOnCrash(
@@ -185,7 +183,8 @@ class BackgroundContentsService : private content::NotificationObserver,
                               const base::string16& appid);
 
   // Invoked when a new BackgroundContents is opened.
-  void BackgroundContentsOpened(BackgroundContentsOpenedDetails* details);
+  void BackgroundContentsOpened(BackgroundContentsOpenedDetails* details,
+                                Profile* profile);
 
   // Invoked when a BackgroundContents object is destroyed.
   void BackgroundContentsShutdown(BackgroundContents* contents);