| OLD | NEW |
| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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/browser/user_metrics.h" | 153 #include "content/browser/user_metrics.h" |
| 154 #include "content/public/browser/devtools_manager.h" | 154 #include "content/public/browser/devtools_manager.h" |
| 155 #include "content/public/browser/notification_service.h" | 155 #include "content/public/browser/notification_service.h" |
| 156 #include "content/public/browser/notification_details.h" | 156 #include "content/public/browser/notification_details.h" |
| 157 #include "content/public/browser/intents_host.h" | 157 #include "content/public/browser/web_intents_dispatcher.h" |
| 158 #include "content/public/common/content_restriction.h" | 158 #include "content/public/common/content_restriction.h" |
| 159 #include "content/public/common/content_switches.h" | 159 #include "content/public/common/content_switches.h" |
| 160 #include "content/public/common/page_zoom.h" | 160 #include "content/public/common/page_zoom.h" |
| 161 #include "grit/chromium_strings.h" | 161 #include "grit/chromium_strings.h" |
| 162 #include "grit/generated_resources.h" | 162 #include "grit/generated_resources.h" |
| 163 #include "grit/locale_settings.h" | 163 #include "grit/locale_settings.h" |
| 164 #include "grit/theme_resources_standard.h" | 164 #include "grit/theme_resources_standard.h" |
| 165 #include "net/base/cookie_monster.h" | 165 #include "net/base/cookie_monster.h" |
| 166 #include "net/base/net_util.h" | 166 #include "net/base/net_util.h" |
| 167 #include "net/base/registry_controlled_domain.h" | 167 #include "net/base/registry_controlled_domain.h" |
| (...skipping 3744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3912 | 3912 |
| 3913 void Browser::RegisterIntentHandler(TabContents* tab, | 3913 void Browser::RegisterIntentHandler(TabContents* tab, |
| 3914 const string16& action, | 3914 const string16& action, |
| 3915 const string16& type, | 3915 const string16& type, |
| 3916 const string16& href, | 3916 const string16& href, |
| 3917 const string16& title, | 3917 const string16& title, |
| 3918 const string16& disposition) { | 3918 const string16& disposition) { |
| 3919 RegisterIntentHandlerHelper(tab, action, type, href, title, disposition); | 3919 RegisterIntentHandlerHelper(tab, action, type, href, title, disposition); |
| 3920 } | 3920 } |
| 3921 | 3921 |
| 3922 void Browser::WebIntentDispatch(TabContents* tab, | 3922 void Browser::WebIntentDispatch( |
| 3923 content::IntentsHost* intents_host) { | 3923 TabContents* tab, content::WebIntentsDispatcher* intents_dispatcher) { |
| 3924 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) | 3924 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) |
| 3925 return; | 3925 return; |
| 3926 | 3926 |
| 3927 TabContentsWrapper* tcw = | 3927 TabContentsWrapper* tcw = |
| 3928 TabContentsWrapper::GetCurrentWrapperForContents(tab); | 3928 TabContentsWrapper::GetCurrentWrapperForContents(tab); |
| 3929 tcw->web_intent_picker_controller()->SetIntentsHost(intents_host); | 3929 tcw->web_intent_picker_controller()->SetIntentsDispatcher(intents_dispatcher); |
| 3930 tcw->web_intent_picker_controller()->ShowDialog( | 3930 tcw->web_intent_picker_controller()->ShowDialog( |
| 3931 this, intents_host->GetIntent().action, intents_host->GetIntent().type); | 3931 this, |
| 3932 intents_dispatcher->GetIntent().action, |
| 3933 intents_dispatcher->GetIntent().type); |
| 3932 } | 3934 } |
| 3933 | 3935 |
| 3934 void Browser::FindReply(TabContents* tab, | 3936 void Browser::FindReply(TabContents* tab, |
| 3935 int request_id, | 3937 int request_id, |
| 3936 int number_of_matches, | 3938 int number_of_matches, |
| 3937 const gfx::Rect& selection_rect, | 3939 const gfx::Rect& selection_rect, |
| 3938 int active_match_ordinal, | 3940 int active_match_ordinal, |
| 3939 bool final_update) { | 3941 bool final_update) { |
| 3940 FindReplyHelper(tab, request_id, number_of_matches, selection_rect, | 3942 FindReplyHelper(tab, request_id, number_of_matches, selection_rect, |
| 3941 active_match_ordinal, final_update); | 3943 active_match_ordinal, final_update); |
| (...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5349 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5351 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
| 5350 } else { | 5352 } else { |
| 5351 GlobalErrorService* service = | 5353 GlobalErrorService* service = |
| 5352 GlobalErrorServiceFactory::GetForProfile(profile()); | 5354 GlobalErrorServiceFactory::GetForProfile(profile()); |
| 5353 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5355 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
| 5354 if (error) { | 5356 if (error) { |
| 5355 error->ShowBubbleView(this); | 5357 error->ShowBubbleView(this); |
| 5356 } | 5358 } |
| 5357 } | 5359 } |
| 5358 } | 5360 } |
| OLD | NEW |