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

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

Issue 8934011: Rename IntentsHost -> WebIntentsDispatcher and IntentsDispatcher -> WebIntentsHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 9 years 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
« no previous file with comments | « chrome/browser/external_tab_container_win.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_container_win.h" 5 #include "chrome/browser/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 27 matching lines...) Expand all
38 #include "chrome/common/chrome_constants.h" 38 #include "chrome/common/chrome_constants.h"
39 #include "chrome/common/chrome_notification_types.h" 39 #include "chrome/common/chrome_notification_types.h"
40 #include "chrome/common/render_messages.h" 40 #include "chrome/common/render_messages.h"
41 #include "chrome/common/url_constants.h" 41 #include "chrome/common/url_constants.h"
42 #include "content/browser/load_notification_details.h" 42 #include "content/browser/load_notification_details.h"
43 #include "content/browser/renderer_host/render_view_host.h" 43 #include "content/browser/renderer_host/render_view_host.h"
44 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" 44 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
45 #include "content/browser/tab_contents/navigation_details.h" 45 #include "content/browser/tab_contents/navigation_details.h"
46 #include "content/browser/tab_contents/provisional_load_details.h" 46 #include "content/browser/tab_contents/provisional_load_details.h"
47 #include "content/browser/tab_contents/tab_contents.h" 47 #include "content/browser/tab_contents/tab_contents.h"
48 #include "content/public/browser/intents_host.h" 48 #include "content/public/browser/web_intents_dispatcher.h"
49 #include "content/public/browser/native_web_keyboard_event.h" 49 #include "content/public/browser/native_web_keyboard_event.h"
50 #include "content/public/browser/notification_service.h" 50 #include "content/public/browser/notification_service.h"
51 #include "content/public/common/bindings_policy.h" 51 #include "content/public/common/bindings_policy.h"
52 #include "content/public/common/frame_navigate_params.h" 52 #include "content/public/common/frame_navigate_params.h"
53 #include "content/public/common/page_transition_types.h" 53 #include "content/public/common/page_transition_types.h"
54 #include "content/public/common/page_zoom.h" 54 #include "content/public/common/page_zoom.h"
55 #include "grit/generated_resources.h" 55 #include "grit/generated_resources.h"
56 #include "grit/locale_settings.h" 56 #include "grit/locale_settings.h"
57 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h " 57 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h "
58 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 58 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 const string16& type, 730 const string16& type,
731 const string16& href, 731 const string16& href,
732 const string16& title, 732 const string16& title,
733 const string16& disposition) { 733 const string16& disposition) {
734 Browser::RegisterIntentHandlerHelper( 734 Browser::RegisterIntentHandlerHelper(
735 tab, action, type, href, title, disposition); 735 tab, action, type, href, title, disposition);
736 } 736 }
737 737
738 void ExternalTabContainer::WebIntentDispatch( 738 void ExternalTabContainer::WebIntentDispatch(
739 TabContents* tab, 739 TabContents* tab,
740 content::IntentsHost* intents_host) { 740 content::WebIntentsDispatcher* intents_dispatcher) {
741 // TODO(binji) How do we want to display the WebIntentPicker bubble if there 741 // TODO(binji) How do we want to display the WebIntentPicker bubble if there
742 // is no BrowserWindow? 742 // is no BrowserWindow?
743 delete intents_host; 743 delete intents_dispatcher;
744 } 744 }
745 745
746 void ExternalTabContainer::FindReply(TabContents* tab, 746 void ExternalTabContainer::FindReply(TabContents* tab,
747 int request_id, 747 int request_id,
748 int number_of_matches, 748 int number_of_matches,
749 const gfx::Rect& selection_rect, 749 const gfx::Rect& selection_rect,
750 int active_match_ordinal, 750 int active_match_ordinal,
751 bool final_update) { 751 bool final_update) {
752 Browser::FindReplyHelper(tab, request_id, number_of_matches, selection_rect, 752 Browser::FindReplyHelper(tab, request_id, number_of_matches, selection_rect,
753 active_match_ordinal, final_update); 753 active_match_ordinal, final_update);
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 if (params.disposition == CURRENT_TAB) { 1183 if (params.disposition == CURRENT_TAB) {
1184 DCHECK(route_all_top_level_navigations_); 1184 DCHECK(route_all_top_level_navigations_);
1185 forward_params.disposition = NEW_FOREGROUND_TAB; 1185 forward_params.disposition = NEW_FOREGROUND_TAB;
1186 } 1186 }
1187 TabContents* new_contents = 1187 TabContents* new_contents =
1188 ExternalTabContainer::OpenURLFromTab(source, forward_params); 1188 ExternalTabContainer::OpenURLFromTab(source, forward_params);
1189 // support only one navigation for a dummy tab before it is killed. 1189 // support only one navigation for a dummy tab before it is killed.
1190 ::DestroyWindow(GetNativeView()); 1190 ::DestroyWindow(GetNativeView());
1191 return new_contents; 1191 return new_contents;
1192 } 1192 }
OLDNEW
« no previous file with comments | « chrome/browser/external_tab_container_win.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698