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

Side by Side Diff: chrome/browser/ui/views/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: Fix merge Created 8 years, 5 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/ui/views/external_tab_container_win.h" 5 #include "chrome/browser/ui/views/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 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 Browser::JSOutOfMemoryHelper(tab); 778 Browser::JSOutOfMemoryHelper(tab);
779 } 779 }
780 780
781 void ExternalTabContainerWin::RegisterProtocolHandler( 781 void ExternalTabContainerWin::RegisterProtocolHandler(
782 WebContents* tab, 782 WebContents* tab,
783 const std::string& protocol, 783 const std::string& protocol,
784 const GURL& url, 784 const GURL& url,
785 const string16& title, 785 const string16& title,
786 bool user_gesture) { 786 bool user_gesture) {
787 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title, 787 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title,
788 user_gesture); 788 user_gesture, NULL);
789 } 789 }
790 790
791 void ExternalTabContainerWin::RegisterIntentHandler( 791 void ExternalTabContainerWin::RegisterIntentHandler(
792 WebContents* tab, 792 WebContents* tab,
793 const webkit_glue::WebIntentServiceData& data, 793 const webkit_glue::WebIntentServiceData& data,
794 bool user_gesture) { 794 bool user_gesture) {
795 Browser::RegisterIntentHandlerHelper(tab, data, user_gesture); 795 Browser::RegisterIntentHandlerHelper(tab, data, user_gesture);
796 } 796 }
797 797
798 void ExternalTabContainerWin::WebIntentDispatch( 798 void ExternalTabContainerWin::WebIntentDispatch(
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1247 if (params.disposition == CURRENT_TAB) { 1247 if (params.disposition == CURRENT_TAB) {
1248 DCHECK(route_all_top_level_navigations_); 1248 DCHECK(route_all_top_level_navigations_);
1249 forward_params.disposition = NEW_FOREGROUND_TAB; 1249 forward_params.disposition = NEW_FOREGROUND_TAB;
1250 } 1250 }
1251 WebContents* new_contents = 1251 WebContents* new_contents =
1252 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); 1252 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
1253 // support only one navigation for a dummy tab before it is killed. 1253 // support only one navigation for a dummy tab before it is killed.
1254 ::DestroyWindow(GetNativeView()); 1254 ::DestroyWindow(GetNativeView());
1255 return new_contents; 1255 return new_contents;
1256 } 1256 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698