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

chrome/browser/tab_contents/render_view_context_menu.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.
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
@@ skipping 22 matching lines @@
 #include "chrome/browser/printing/print_preview_context_menu_observer.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_host.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
+#include "chrome/browser/tab_contents/retargeting_details.h"
 #include "chrome/browser/tab_contents/spellchecker_submenu_observer.h"
 #include "chrome/browser/tab_contents/spelling_menu_observer.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/per_tab_prefs_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ skipping 1747 matching lines @@
 
 void RenderViewContextMenu::OpenURL(
     const GURL& url, const GURL& referrer, int64 frame_id,
     WindowOpenDisposition disposition,
     content::PageTransition transition) {
   TabContents* new_contents = source_tab_contents_->OpenURL(OpenURLParams(
       url, content::Referrer(referrer, params_.referrer_policy), disposition,
       transition, false));
 
   if (new_contents) {
-    content::RetargetingDetails details;
+    RetargetingDetails details;
     details.source_tab_contents = source_tab_contents_;
     details.source_frame_id = frame_id;
     details.target_url = url;
     details.target_tab_contents = new_contents;
+    details.not_yet_in_tabstrip = false;
     content::NotificationService::current()->Notify(
-        content::NOTIFICATION_RETARGETING,
-        content::Source<content::BrowserContext>(
-            source_tab_contents_->browser_context()),
-        content::Details<content::RetargetingDetails>(&details));
+        chrome::NOTIFICATION_RETARGETING,
+        content::Source<Profile>(Profile::FromBrowserContext(
+            source_tab_contents_->browser_context())),
+        content::Details<RetargetingDetails>(&details));
   }
 }
 
 void RenderViewContextMenu::CopyImageAt(int x, int y) {
   source_tab_contents_->render_view_host()->CopyImageAt(x, y);
 }
 
 void RenderViewContextMenu::Inspect(int x, int y) {
   UserMetrics::RecordAction(UserMetricsAction("DevTools_InspectElement"));
   DevToolsWindow::InspectElement(
       source_tab_contents_->render_view_host(), x, y);
 }
 
 void RenderViewContextMenu::WriteURLToClipboard(const GURL& url) {
   chrome_browser_net::WriteURLToClipboard(
       url,
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
       g_browser_process->clipboard());
 }
 
 void RenderViewContextMenu::MediaPlayerActionAt(
     const gfx::Point& location,
     const WebMediaPlayerAction& action) {
   source_tab_contents_->render_view_host()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }