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

chrome/browser/extensions/extension_webnavigation_api.cc

 // 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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/extension_webnavigation_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_webnavigation_api_constants.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/tab_contents/retargeting_details.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "net/base/net_errors.h"
 
 namespace keys = extension_webnavigation_api_constants;
 
 namespace {
@@ skipping 135 matching lines @@
 }
 
 // Constructs and dispatches an onCreatedNavigationTarget event.
 void DispatchOnCreatedNavigationTarget(
     TabContents* tab_contents,
     content::BrowserContext* browser_context,
     int64 source_frame_id,
     bool source_frame_is_main_frame,
     TabContents* target_tab_contents,
     const GURL& target_url) {
+  // Check that the tab is already inserted into a tab strip model. This code
+  // path is exercised by ExtensionApiTest.WebNavigationRequestOpenTab.
+  DCHECK(ExtensionTabUtil::GetTabById(
+      ExtensionTabUtil::GetTabId(target_tab_contents),
+      Profile::FromBrowserContext(target_tab_contents->browser_context()),
+      false, NULL, NULL, NULL, NULL));
+
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger(keys::kSourceTabIdKey,
                    ExtensionTabUtil::GetTabId(tab_contents));
   dict->SetInteger(keys::kSourceFrameIdKey,
       GetFrameId(source_frame_is_main_frame, source_frame_id));
   dict->SetString(keys::kUrlKey, target_url.possibly_invalid_spec());
   dict->SetInteger(keys::kTabIdKey,
                    ExtensionTabUtil::GetTabId(target_tab_contents));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
@@ skipping 172 matching lines @@
 ExtensionWebNavigationEventRouter::PendingTabContents::~PendingTabContents() {}
 
 ExtensionWebNavigationEventRouter::ExtensionWebNavigationEventRouter(
     Profile* profile) : profile_(profile) {}
 
 ExtensionWebNavigationEventRouter::~ExtensionWebNavigationEventRouter() {}
 
 void ExtensionWebNavigationEventRouter::Init() {
   if (registrar_.IsEmpty()) {
     registrar_.Add(this,
-                   content::NOTIFICATION_RETARGETING,
-                   content::Source<content::BrowserContext>(profile_));
+                   chrome::NOTIFICATION_RETARGETING,
+                   content::Source<Profile>(profile_));
     registrar_.Add(this,
                    content::NOTIFICATION_TAB_ADDED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                    content::NotificationService::AllSources());
   }
 }
 
 void ExtensionWebNavigationEventRouter::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
-    case content::NOTIFICATION_RETARGETING:
+    case chrome::NOTIFICATION_RETARGETING:
       Retargeting(
-          content::Details<const content::RetargetingDetails>(details).ptr());
+          content::Details<const RetargetingDetails>(details).ptr());
       break;
 
     case content::NOTIFICATION_TAB_ADDED:
       TabAdded(content::Details<TabContents>(details).ptr());
       break;
 
     case content::NOTIFICATION_TAB_CONTENTS_DESTROYED:
       TabDestroyed(content::Source<TabContents>(source).ptr());
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 void ExtensionWebNavigationEventRouter::Retargeting(
-    const content::RetargetingDetails* details) {
+    const RetargetingDetails* details) {
   if (details->source_frame_id == 0)
     return;
   ExtensionWebNavigationTabObserver* tab_observer =
       ExtensionWebNavigationTabObserver::Get(details->source_tab_contents);
   if (!tab_observer) {
     CHECK(details->source_tab_contents->GetRenderViewType() !=
           content::VIEW_TYPE_TAB_CONTENTS);
     return;
   }
   const FrameNavigationState& frame_navigation_state =
       tab_observer->frame_navigation_state();
 
   if (!frame_navigation_state.CanSendEvents(details->source_frame_id))
     return;
 
-  // If the TabContents was created as a response to an IPC from a renderer, it
-  // doesn't yet have a wrapper, and we need to delay the extension event until
-  // the TabContents is fully initialized.
-  if (TabContentsWrapper::GetCurrentWrapperForContents(
-      details->target_tab_contents) == NULL) {
+  // If the TabContents was created as a response to an IPC from a renderer
+  // (and therefore doesn't yet have a wrapper), or if it isn't yet inserted
+  // into a tab strip, we need to delay the extension event until the
+  // TabContents is fully initialized.
+  if ((TabContentsWrapper::GetCurrentWrapperForContents(
+       details->target_tab_contents) == NULL) ||
+      details->not_yet_in_tabstrip) {
     pending_tab_contents_[details->target_tab_contents] =
         PendingTabContents(
             details->source_tab_contents,
             details->source_frame_id,
             frame_navigation_state.IsMainFrame(details->source_frame_id),
             details->target_tab_contents,
             details->target_url);
   } else {
     DispatchOnCreatedNavigationTarget(
         details->source_tab_contents,
@@ skipping 296 matching lines @@
         keys::kFrameIdKey,
         GetFrameId(navigation_state.IsMainFrame(*frame), *frame));
     frameDict->SetBoolean(
         keys::kErrorOccurredKey,
         navigation_state.GetErrorOccurredInFrame(*frame));
     resultList->Append(frameDict);
   }
   result_.reset(resultList);
   return true;
 }