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

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

Issue 8417012: Refactor loading out of ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: finally Created 9 years, 1 month 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
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 4130 matching lines...) Expand 10 before | Expand all | Expand 10 after
4141 4141
4142 pending_web_app_action_ = NONE; 4142 pending_web_app_action_ = NONE;
4143 } 4143 }
4144 4144
4145 void Browser::OnInstallApplication(TabContentsWrapper* source, 4145 void Browser::OnInstallApplication(TabContentsWrapper* source,
4146 const WebApplicationInfo& web_app) { 4146 const WebApplicationInfo& web_app) {
4147 ExtensionService* extension_service = profile()->GetExtensionService(); 4147 ExtensionService* extension_service = profile()->GetExtensionService();
4148 if (!extension_service) 4148 if (!extension_service)
4149 return; 4149 return;
4150 4150
4151 scoped_refptr<CrxInstaller> installer(extension_service->MakeCrxInstaller( 4151 scoped_refptr<CrxInstaller> installer(CrxInstaller::Create(
4152 extension_service,
4152 extension_service->show_extensions_prompts() ? 4153 extension_service->show_extensions_prompts() ?
4153 new ExtensionInstallUI(profile()) : NULL)); 4154 new ExtensionInstallUI(profile()) : NULL));
4154 installer->InstallWebApp(web_app); 4155 installer->InstallWebApp(web_app);
4155 } 4156 }
4156 4157
4157 /////////////////////////////////////////////////////////////////////////////// 4158 ///////////////////////////////////////////////////////////////////////////////
4158 // Browser, SearchEngineTabHelperDelegate implementation: 4159 // Browser, SearchEngineTabHelperDelegate implementation:
4159 4160
4160 void Browser::ConfirmSetDefaultSearchProvider(TabContents* tab_contents, 4161 void Browser::ConfirmSetDefaultSearchProvider(TabContents* tab_contents,
4161 TemplateURL* template_url, 4162 TemplateURL* template_url,
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
5502 } 5503 }
5503 5504
5504 void Browser::UpdateFullscreenExitBubbleContent() { 5505 void Browser::UpdateFullscreenExitBubbleContent() {
5505 GURL url; 5506 GURL url;
5506 if (fullscreened_tab_) 5507 if (fullscreened_tab_)
5507 url = fullscreened_tab_->tab_contents()->GetURL(); 5508 url = fullscreened_tab_->tab_contents()->GetURL();
5508 5509
5509 window_->UpdateFullscreenExitBubbleContent( 5510 window_->UpdateFullscreenExitBubbleContent(
5510 url, GetFullscreenExitBubbleType()); 5511 url, GetFullscreenExitBubbleType());
5511 } 5512 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/panels/base_panel_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698