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

Side by Side Diff: chrome/browser/tab_contents/tab_util.cc

Issue 8827013: Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: extent 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
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/tab_contents/tab_util.h" 5 #include "chrome/browser/tab_contents/tab_util.h"
6 6
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h" 9 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 14 matching lines...) Expand all
25 } 25 }
26 26
27 SiteInstance* GetSiteInstanceForNewTab(TabContents* source_contents, 27 SiteInstance* GetSiteInstanceForNewTab(TabContents* source_contents,
28 Profile* profile, 28 Profile* profile,
29 const GURL& url) { 29 const GURL& url) {
30 // If url is a WebUI or extension, we need to be sure to use the right type 30 // If url is a WebUI or extension, we need to be sure to use the right type
31 // of renderer process up front. Otherwise, we create a normal SiteInstance 31 // of renderer process up front. Otherwise, we create a normal SiteInstance
32 // as part of creating the tab. 32 // as part of creating the tab.
33 ExtensionService* service = profile->GetExtensionService(); 33 ExtensionService* service = profile->GetExtensionService();
34 if (ChromeWebUIFactory::GetInstance()->UseWebUIForURL(profile, url) || 34 if (ChromeWebUIFactory::GetInstance()->UseWebUIForURL(profile, url) ||
35 (service && service->GetExtensionByWebExtent(url))) { 35 (service && service->extensions()->GetByWebExtent(url))) {
36 return SiteInstance::CreateSiteInstanceForURL(profile, url); 36 return SiteInstance::CreateSiteInstanceForURL(profile, url);
37 } 37 }
38 38
39 if (!source_contents) 39 if (!source_contents)
40 return NULL; 40 return NULL;
41 41
42 // Don't use this logic when "--process-per-tab" is specified. 42 // Don't use this logic when "--process-per-tab" is specified.
43 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerTab) && 43 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerTab) &&
44 SiteInstance::IsSameWebSite(source_contents->browser_context(), 44 SiteInstance::IsSameWebSite(source_contents->browser_context(),
45 source_contents->GetURL(), 45 source_contents->GetURL(),
46 url)) { 46 url)) {
47 return source_contents->GetSiteInstance(); 47 return source_contents->GetSiteInstance();
48 } 48 }
49 return NULL; 49 return NULL;
50 } 50 }
51 51
52 } // namespace tab_util 52 } // namespace tab_util
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698