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

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

Issue 434613003: Remove all the browser side extensions code from Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months 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
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 8 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "content/public/browser/render_view_host.h" 10 #include "content/public/browser/render_view_host.h"
11 #include "content/public/browser/site_instance.h" 11 #include "content/public/browser/site_instance.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 #include "url/gurl.h"
14
15 #if defined(ENABLE_EXTENSIONS)
13 #include "extensions/browser/extension_registry.h" 16 #include "extensions/browser/extension_registry.h"
14 #include "url/gurl.h" 17 #endif
15 18
16 using content::RenderViewHost; 19 using content::RenderViewHost;
17 using content::SiteInstance; 20 using content::SiteInstance;
18 using content::WebContents; 21 using content::WebContents;
19 22
20 namespace tab_util { 23 namespace tab_util {
21 24
22 content::WebContents* GetWebContentsByID(int render_process_id, 25 content::WebContents* GetWebContentsByID(int render_process_id,
23 int render_view_id) { 26 int render_view_id) {
24 RenderViewHost* render_view_host = 27 RenderViewHost* render_view_host =
25 RenderViewHost::FromID(render_process_id, render_view_id); 28 RenderViewHost::FromID(render_process_id, render_view_id);
26 if (!render_view_host) 29 if (!render_view_host)
27 return NULL; 30 return NULL;
28 return WebContents::FromRenderViewHost(render_view_host); 31 return WebContents::FromRenderViewHost(render_view_host);
29 } 32 }
30 33
31 SiteInstance* GetSiteInstanceForNewTab(Profile* profile, 34 SiteInstance* GetSiteInstanceForNewTab(Profile* profile,
32 const GURL& url) { 35 const GURL& url) {
33 // If |url| is a WebUI or extension, we set the SiteInstance up front so that 36 // If |url| is a WebUI or extension, we set the SiteInstance up front so that
34 // we don't end up with an extra process swap on the first navigation. 37 // we don't end up with an extra process swap on the first navigation.
35 if (ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL( 38 if (ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL(profile, url))
36 profile, url) ||
37 extensions::ExtensionRegistry::Get(
38 profile)->enabled_extensions().GetHostedAppByURL(url)) {
39 return SiteInstance::CreateForURL(profile, url); 39 return SiteInstance::CreateForURL(profile, url);
40 } 40
41 #if defined(ENABLE_EXTENSIONS)
42 if (extensions::ExtensionRegistry::Get(
43 profile)->enabled_extensions().GetHostedAppByURL(url))
44 return SiteInstance::CreateForURL(profile, url);
45 #endif
41 46
42 // We used to share the SiteInstance for same-site links opened in new tabs, 47 // We used to share the SiteInstance for same-site links opened in new tabs,
43 // to leverage the in-memory cache and reduce process creation. It now 48 // to leverage the in-memory cache and reduce process creation. It now
44 // appears that it is more useful to have such links open in a new process, 49 // appears that it is more useful to have such links open in a new process,
45 // so we create new tabs in a new BrowsingInstance. 50 // so we create new tabs in a new BrowsingInstance.
46 return NULL; 51 return NULL;
47 } 52 }
48 53
49 } // namespace tab_util 54 } // namespace tab_util
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698