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

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: Repair merge 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/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 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 Browser::JSOutOfMemoryHelper(tab); 780 Browser::JSOutOfMemoryHelper(tab);
781 } 781 }
782 782
783 void ExternalTabContainerWin::RegisterProtocolHandler( 783 void ExternalTabContainerWin::RegisterProtocolHandler(
784 WebContents* tab, 784 WebContents* tab,
785 const std::string& protocol, 785 const std::string& protocol,
786 const GURL& url, 786 const GURL& url,
787 const string16& title, 787 const string16& title,
788 bool user_gesture) { 788 bool user_gesture) {
789 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title, 789 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title,
790 user_gesture); 790 user_gesture, NULL);
791 } 791 }
792 792
793 void ExternalTabContainerWin::RegisterIntentHandler( 793 void ExternalTabContainerWin::RegisterIntentHandler(
794 WebContents* tab, 794 WebContents* tab,
795 const webkit_glue::WebIntentServiceData& data, 795 const webkit_glue::WebIntentServiceData& data,
796 bool user_gesture) { 796 bool user_gesture) {
797 Browser::RegisterIntentHandlerHelper(tab, data, user_gesture); 797 Browser::RegisterIntentHandlerHelper(tab, data, user_gesture);
798 } 798 }
799 799
800 void ExternalTabContainerWin::WebIntentDispatch( 800 void ExternalTabContainerWin::WebIntentDispatch(
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
1242 if (params.disposition == CURRENT_TAB) { 1242 if (params.disposition == CURRENT_TAB) {
1243 DCHECK(route_all_top_level_navigations_); 1243 DCHECK(route_all_top_level_navigations_);
1244 forward_params.disposition = NEW_FOREGROUND_TAB; 1244 forward_params.disposition = NEW_FOREGROUND_TAB;
1245 } 1245 }
1246 WebContents* new_contents = 1246 WebContents* new_contents =
1247 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); 1247 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
1248 // support only one navigation for a dummy tab before it is killed. 1248 // support only one navigation for a dummy tab before it is killed.
1249 ::DestroyWindow(GetNativeView()); 1249 ::DestroyWindow(GetNativeView());
1250 return new_contents; 1250 return new_contents;
1251 } 1251 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698