Merge 114806 - Include the information whether the tab is already in a tab strip with the retarge...

chrome/browser/extensions/extension_webnavigation_api.h

Index: chrome/browser/extensions/extension_webnavigation_api.h
===================================================================
--- chrome/browser/extensions/extension_webnavigation_api.h	(revision 116088)
+++ chrome/browser/extensions/extension_webnavigation_api.h	(working copy)
@@ -21,9 +21,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
-namespace content {
 struct RetargetingDetails;
-}
 class TabContents;
 
 // Tracks the navigation state of all frames in a given tab currently known to
@@ -208,7 +206,7 @@
   // Handler for the NOTIFICATION_RETARGETING event. The method takes the
   // details of such an event and stores them for the later
   // NOTIFICATION_TAB_ADDED event.
-  void Retargeting(const content::RetargetingDetails* details);
+  void Retargeting(const RetargetingDetails* details);
 
   // Handler for the NOTIFICATION_TAB_ADDED event. The method takes the details
   // of such an event and creates a JSON formated extension event from it.