Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: chrome/browser/external_tab/external_tab_container_win.cc

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/external_tab/external_tab_container_win.h" 5 #include "chrome/browser/external_tab/external_tab_container_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 void ExternalTabContainer::JSOutOfMemory(WebContents* tab) { 733 void ExternalTabContainer::JSOutOfMemory(WebContents* tab) {
734 Browser::JSOutOfMemoryHelper(tab); 734 Browser::JSOutOfMemoryHelper(tab);
735 } 735 }
736 736
737 void ExternalTabContainer::RegisterProtocolHandler(WebContents* tab, 737 void ExternalTabContainer::RegisterProtocolHandler(WebContents* tab,
738 const std::string& protocol, 738 const std::string& protocol,
739 const GURL& url, 739 const GURL& url,
740 const string16& title, 740 const string16& title,
741 bool user_gesture) { 741 bool user_gesture) {
742 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title, 742 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title,
743 user_gesture); 743 user_gesture, NULL);
744 } 744 }
745 745
746 void ExternalTabContainer::RegisterIntentHandler( 746 void ExternalTabContainer::RegisterIntentHandler(
747 WebContents* tab, 747 WebContents* tab,
748 const webkit_glue::WebIntentServiceData& data, 748 const webkit_glue::WebIntentServiceData& data,
749 bool user_gesture) { 749 bool user_gesture) {
750 Browser::RegisterIntentHandlerHelper(tab, data, user_gesture); 750 Browser::RegisterIntentHandlerHelper(tab, data, user_gesture);
751 } 751 }
752 752
753 void ExternalTabContainer::WebIntentDispatch( 753 void ExternalTabContainer::WebIntentDispatch(
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 if (params.disposition == CURRENT_TAB) { 1202 if (params.disposition == CURRENT_TAB) {
1203 DCHECK(route_all_top_level_navigations_); 1203 DCHECK(route_all_top_level_navigations_);
1204 forward_params.disposition = NEW_FOREGROUND_TAB; 1204 forward_params.disposition = NEW_FOREGROUND_TAB;
1205 } 1205 }
1206 WebContents* new_contents = 1206 WebContents* new_contents =
1207 ExternalTabContainer::OpenURLFromTab(source, forward_params); 1207 ExternalTabContainer::OpenURLFromTab(source, forward_params);
1208 // support only one navigation for a dummy tab before it is killed. 1208 // support only one navigation for a dummy tab before it is killed.
1209 ::DestroyWindow(GetNativeView()); 1209 ::DestroyWindow(GetNativeView());
1210 return new_contents; 1210 return new_contents;
1211 } 1211 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698