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 3894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3905 | 3905 |
3906 scoped_refptr<CrxInstaller> installer(extension_service->MakeCrxInstaller( | 3906 scoped_refptr<CrxInstaller> installer(extension_service->MakeCrxInstaller( |
3907 extension_service->show_extensions_prompts() ? | 3907 extension_service->show_extensions_prompts() ? |
3908 new ExtensionInstallUI(profile()) : NULL)); | 3908 new ExtensionInstallUI(profile()) : NULL)); |
3909 installer->InstallWebApp(web_app); | 3909 installer->InstallWebApp(web_app); |
3910 } | 3910 } |
3911 | 3911 |
3912 /////////////////////////////////////////////////////////////////////////////// | 3912 /////////////////////////////////////////////////////////////////////////////// |
3913 // Browser, SearchEngineTabHelperDelegate implementation: | 3913 // Browser, SearchEngineTabHelperDelegate implementation: |
3914 | 3914 |
3915 void Browser::ConfirmSetDefaultSearchProvider( | 3915 void Browser::ConfirmSetDefaultSearchProvider(TabContents* tab_contents, |
3916 TabContents* tab_contents, | 3916 TemplateURL* template_url, |
3917 TemplateURL* template_url, | 3917 Profile* profile) { |
3918 TemplateURLService* template_url_service) { | |
3919 window()->ConfirmSetDefaultSearchProvider(tab_contents, template_url, | 3918 window()->ConfirmSetDefaultSearchProvider(tab_contents, template_url, |
3920 template_url_service); | 3919 profile); |
3921 } | 3920 } |
3922 | 3921 |
3923 void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url, | 3922 void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url, |
3924 Profile* profile) { | 3923 Profile* profile) { |
3925 window()->ConfirmAddSearchProvider(template_url, profile); | 3924 window()->ConfirmAddSearchProvider(template_url, profile); |
3926 } | 3925 } |
3927 | 3926 |
3928 /////////////////////////////////////////////////////////////////////////////// | 3927 /////////////////////////////////////////////////////////////////////////////// |
3929 // Browser, BlockedContentTabHelperDelegate implementation: | 3928 // Browser, BlockedContentTabHelperDelegate implementation: |
3930 | 3929 |
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5274 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5273 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
5275 } else if (is_type_tabbed()) { | 5274 } else if (is_type_tabbed()) { |
5276 GlobalErrorService* service = | 5275 GlobalErrorService* service = |
5277 GlobalErrorServiceFactory::GetForProfile(profile()); | 5276 GlobalErrorServiceFactory::GetForProfile(profile()); |
5278 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5277 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
5279 if (error) { | 5278 if (error) { |
5280 error->ShowBubbleView(this); | 5279 error->ShowBubbleView(this); |
5281 } | 5280 } |
5282 } | 5281 } |
5283 } | 5282 } |
OLD | NEW |