Move Android to use new Popup Blocker API.

chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc

 // Copyright 2013 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 "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view.h"
 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
+#endif
+
 using WebKit::WebWindowFeatures;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PopupBlockerTabHelper);
 
 struct PopupBlockerTabHelper::BlockedRequest {
   BlockedRequest(const chrome::NavigateParams& params,
                  const WebWindowFeatures& window_features)
       : params(params), window_features(window_features) {}
 
   chrome::NavigateParams params;
@@ skipping 99 matching lines @@
 
   blocked_popups_.Add(new BlockedRequest(nav_params, features));
   TabSpecificContentSettings::FromWebContents(web_contents())->
       OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS, std::string());
 }
 
 void PopupBlockerTabHelper::ShowBlockedPopup(int32 id) {
   BlockedRequest* popup = blocked_popups_.Lookup(id);
   if (!popup)
     return;
+#if defined(OS_ANDROID)
+  TabModelList::HandleNavigation(&popup->params);

[Yaron, 2013/08/21 19:07:58]

So maybe this is how you can clean up the browser_navigator.cc dependency. You
could have android also implement chrome::Navigate with a different cc-file and
avoid introducing depending on browser_navigator.cc

[David Trainor- moved to gerrit, 2013/08/21 20:21:27]

To do that I'd have to pull apart browser_navigator.cc as right now
NavigateParams are in there along with these methods.  I can do that but I'd
rather do that in another CL.  Also chrome::Navigate does a LOT of stuff. 
Having a general case implementation will require more work.

+#else
   chrome::Navigate(&popup->params);
+#endif
   if (popup->params.target_contents) {
     popup->params.target_contents->Send(new ChromeViewMsg_SetWindowFeatures(
         popup->params.target_contents->GetRoutingID(), popup->window_features));
   }
   blocked_popups_.Remove(id);
   if (blocked_popups_.IsEmpty())
     PopupNotificationVisibilityChanged(false);
 }
 
 size_t PopupBlockerTabHelper::GetBlockedPopupsCount() const {
   return blocked_popups_.size();
 }
 
 std::map<int32, GURL> PopupBlockerTabHelper::GetBlockedPopupRequests() {
   std::map<int32, GURL> result;
   for (IDMap<BlockedRequest, IDMapOwnPointer>::const_iterator iter(
            &blocked_popups_);
        !iter.IsAtEnd();
        iter.Advance()) {
     result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url;
   }
   return result;
 }