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

Side by Side Diff: chrome/browser/ui/browser.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/ui/browser.h ('k') | chrome/browser/ui/intents/web_intent_picker_controller.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/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 #include "content/browser/renderer_host/render_view_host.h" 146 #include "content/browser/renderer_host/render_view_host.h"
147 #include "content/browser/site_instance.h" 147 #include "content/browser/site_instance.h"
148 #include "content/browser/tab_contents/interstitial_page.h" 148 #include "content/browser/tab_contents/interstitial_page.h"
149 #include "content/browser/tab_contents/navigation_controller.h" 149 #include "content/browser/tab_contents/navigation_controller.h"
150 #include "content/browser/tab_contents/navigation_entry.h" 150 #include "content/browser/tab_contents/navigation_entry.h"
151 #include "content/browser/tab_contents/tab_contents.h" 151 #include "content/browser/tab_contents/tab_contents.h"
152 #include "content/browser/tab_contents/tab_contents_view.h" 152 #include "content/browser/tab_contents/tab_contents_view.h"
153 #include "content/public/browser/devtools_manager.h" 153 #include "content/public/browser/devtools_manager.h"
154 #include "content/public/browser/download_item.h" 154 #include "content/public/browser/download_item.h"
155 #include "content/public/browser/download_manager.h" 155 #include "content/public/browser/download_manager.h"
156 #include "content/public/browser/intents_host.h"
157 #include "content/public/browser/notification_details.h" 156 #include "content/public/browser/notification_details.h"
158 #include "content/public/browser/notification_service.h" 157 #include "content/public/browser/notification_service.h"
159 #include "content/public/browser/plugin_service.h" 158 #include "content/public/browser/plugin_service.h"
160 #include "content/public/browser/user_metrics.h" 159 #include "content/public/browser/user_metrics.h"
160 #include "content/public/browser/web_intents_dispatcher.h"
161 #include "content/public/common/content_restriction.h" 161 #include "content/public/common/content_restriction.h"
162 #include "content/public/common/content_switches.h" 162 #include "content/public/common/content_switches.h"
163 #include "content/public/common/page_zoom.h" 163 #include "content/public/common/page_zoom.h"
164 #include "grit/chromium_strings.h" 164 #include "grit/chromium_strings.h"
165 #include "grit/generated_resources.h" 165 #include "grit/generated_resources.h"
166 #include "grit/locale_settings.h" 166 #include "grit/locale_settings.h"
167 #include "grit/theme_resources_standard.h" 167 #include "grit/theme_resources_standard.h"
168 #include "net/base/cookie_monster.h" 168 #include "net/base/cookie_monster.h"
169 #include "net/base/net_util.h" 169 #include "net/base/net_util.h"
170 #include "net/base/registry_controlled_domain.h" 170 #include "net/base/registry_controlled_domain.h"
(...skipping 3748 matching lines...) Expand 10 before | Expand all | Expand 10 after
3919 3919
3920 void Browser::RegisterIntentHandler(TabContents* tab, 3920 void Browser::RegisterIntentHandler(TabContents* tab,
3921 const string16& action, 3921 const string16& action,
3922 const string16& type, 3922 const string16& type,
3923 const string16& href, 3923 const string16& href,
3924 const string16& title, 3924 const string16& title,
3925 const string16& disposition) { 3925 const string16& disposition) {
3926 RegisterIntentHandlerHelper(tab, action, type, href, title, disposition); 3926 RegisterIntentHandlerHelper(tab, action, type, href, title, disposition);
3927 } 3927 }
3928 3928
3929 void Browser::WebIntentDispatch(TabContents* tab, 3929 void Browser::WebIntentDispatch(
3930 content::IntentsHost* intents_host) { 3930 TabContents* tab, content::WebIntentsDispatcher* intents_dispatcher) {
3931 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) 3931 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
3932 return; 3932 return;
3933 3933
3934 TabContentsWrapper* tcw = 3934 TabContentsWrapper* tcw =
3935 TabContentsWrapper::GetCurrentWrapperForContents(tab); 3935 TabContentsWrapper::GetCurrentWrapperForContents(tab);
3936 tcw->web_intent_picker_controller()->SetIntentsHost(intents_host); 3936 tcw->web_intent_picker_controller()->SetIntentsDispatcher(intents_dispatcher);
3937 tcw->web_intent_picker_controller()->ShowDialog( 3937 tcw->web_intent_picker_controller()->ShowDialog(
3938 this, intents_host->GetIntent().action, intents_host->GetIntent().type); 3938 this,
3939 intents_dispatcher->GetIntent().action,
3940 intents_dispatcher->GetIntent().type);
3939 } 3941 }
3940 3942
3941 void Browser::FindReply(TabContents* tab, 3943 void Browser::FindReply(TabContents* tab,
3942 int request_id, 3944 int request_id,
3943 int number_of_matches, 3945 int number_of_matches,
3944 const gfx::Rect& selection_rect, 3946 const gfx::Rect& selection_rect,
3945 int active_match_ordinal, 3947 int active_match_ordinal,
3946 bool final_update) { 3948 bool final_update) {
3947 FindReplyHelper(tab, request_id, number_of_matches, selection_rect, 3949 FindReplyHelper(tab, request_id, number_of_matches, selection_rect,
3948 active_match_ordinal, final_update); 3950 active_match_ordinal, final_update);
(...skipping 1408 matching lines...) Expand 10 before | Expand all | Expand 10 after
5357 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); 5359 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
5358 } else { 5360 } else {
5359 GlobalErrorService* service = 5361 GlobalErrorService* service =
5360 GlobalErrorServiceFactory::GetForProfile(profile()); 5362 GlobalErrorServiceFactory::GetForProfile(profile());
5361 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5363 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5362 if (error) { 5364 if (error) {
5363 error->ShowBubbleView(this); 5365 error->ShowBubbleView(this);
5364 } 5366 }
5365 } 5367 }
5366 } 5368 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/intents/web_intent_picker_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698