| 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 3901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3912 | 3912 |
| 3913 scoped_refptr<CrxInstaller> installer(extension_service->MakeCrxInstaller( | 3913 scoped_refptr<CrxInstaller> installer(extension_service->MakeCrxInstaller( |
| 3914 extension_service->show_extensions_prompts() ? | 3914 extension_service->show_extensions_prompts() ? |
| 3915 new ExtensionInstallUI(profile()) : NULL)); | 3915 new ExtensionInstallUI(profile()) : NULL)); |
| 3916 installer->InstallWebApp(web_app); | 3916 installer->InstallWebApp(web_app); |
| 3917 } | 3917 } |
| 3918 | 3918 |
| 3919 /////////////////////////////////////////////////////////////////////////////// | 3919 /////////////////////////////////////////////////////////////////////////////// |
| 3920 // Browser, SearchEngineTabHelperDelegate implementation: | 3920 // Browser, SearchEngineTabHelperDelegate implementation: |
| 3921 | 3921 |
| 3922 void Browser::ConfirmSetDefaultSearchProvider( | 3922 void Browser::ConfirmSetDefaultSearchProvider(TabContents* tab_contents, |
| 3923 TabContents* tab_contents, | 3923 TemplateURL* template_url, |
| 3924 TemplateURL* template_url, | 3924 Profile* profile) { |
| 3925 TemplateURLService* template_url_service) { | |
| 3926 window()->ConfirmSetDefaultSearchProvider(tab_contents, template_url, | 3925 window()->ConfirmSetDefaultSearchProvider(tab_contents, template_url, |
| 3927 template_url_service); | 3926 profile); |
| 3928 } | 3927 } |
| 3929 | 3928 |
| 3930 void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url, | 3929 void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url, |
| 3931 Profile* profile) { | 3930 Profile* profile) { |
| 3932 window()->ConfirmAddSearchProvider(template_url, profile); | 3931 window()->ConfirmAddSearchProvider(template_url, profile); |
| 3933 } | 3932 } |
| 3934 | 3933 |
| 3935 /////////////////////////////////////////////////////////////////////////////// | 3934 /////////////////////////////////////////////////////////////////////////////// |
| 3936 // Browser, BlockedContentTabHelperDelegate implementation: | 3935 // Browser, BlockedContentTabHelperDelegate implementation: |
| 3937 | 3936 |
| (...skipping 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5285 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5284 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
| 5286 } else if (is_type_tabbed()) { | 5285 } else if (is_type_tabbed()) { |
| 5287 GlobalErrorService* service = | 5286 GlobalErrorService* service = |
| 5288 GlobalErrorServiceFactory::GetForProfile(profile()); | 5287 GlobalErrorServiceFactory::GetForProfile(profile()); |
| 5289 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5288 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
| 5290 if (error) { | 5289 if (error) { |
| 5291 error->ShowBubbleView(this); | 5290 error->ShowBubbleView(this); |
| 5292 } | 5291 } |
| 5293 } | 5292 } |
| 5294 } | 5293 } |
| OLD | NEW |