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

chrome/browser/extensions/extension_webnavigation_api.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Defines the Chrome Extensions WebNavigation API functions for observing and
 // intercepting navigation events, as specified in
 // chrome/common/extensions/api/extension_api.json.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_H_
 #pragma once
 
 #include <map>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/public/browser/notification_observer.h"
 #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
 // the webNavigation API. It is mainly used to track in which frames an error
 // occurred so no further events for this frame are being sent.
 class FrameNavigationState {
  public:
   typedef std::set<int64>::const_iterator const_iterator;
 
   FrameNavigationState();
@@ skipping 164 matching lines @@
   };
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // 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.
   void TabAdded(TabContents* tab_contents);
 
   // Handler for NOTIFICATION_TAB_CONTENTS_DESTROYED. If |tab_contents| is
   // in |pending_tab_contents_|, it is removed.
   void TabDestroyed(TabContents* tab_contents);
 
   // Mapping pointers to TabContents objects to information about how they got
@@ skipping 17 matching lines @@
 };
 
 // API function that returns the states of all frames in a given tab.
 class GetAllFramesFunction : public SyncExtensionFunction {
   virtual ~GetAllFramesFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("webNavigation.getAllFrames")
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_H_