apps/shell/browser/shell_content_browser_client.cc - Issue 151893002: Reorganize apps/shell into app, browser and common directories

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: apps/shell/browser/shell_content_browser_client.cc

Issue 151893002: Reorganize apps/shell into app, browser and common directories (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix ash (subdirs) Created 6 years, 10 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

« apps/DEPS ('K') | « apps/shell/browser/shell_content_browser_client.h ('k') | apps/shell/browser/shell_extension_system.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "apps/shell/shell_content_browser_client.h"	5 #include "apps/shell/browser/shell_content_browser_client.h"

6	6

7 #include "apps/shell/shell_browser_context.h"	7 #include "apps/shell/browser/shell_browser_context.h"

8 #include "apps/shell/shell_browser_main_parts.h"	8 #include "apps/shell/browser/shell_browser_main_parts.h"

9 #include "apps/shell/shell_extension_system.h"	9 #include "apps/shell/browser/shell_extension_system.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "chrome/browser/extensions/extension_protocols.h"	11 #include "chrome/browser/extensions/extension_protocols.h"

12 #include "chrome/browser/extensions/extension_resource_protocols.h"	12 #include "chrome/browser/extensions/extension_resource_protocols.h"

13 #include "content/public/browser/browser_thread.h"	13 #include "content/public/browser/browser_thread.h"

14 #include "content/public/browser/render_process_host.h"	14 #include "content/public/browser/render_process_host.h"

15 #include "content/public/browser/site_instance.h"	15 #include "content/public/browser/site_instance.h"

16 #include "content/public/common/content_switches.h"	16 #include "content/public/common/content_switches.h"

17 #include "content/public/common/url_constants.h"	17 #include "content/public/common/url_constants.h"

18 #include "content/shell/browser/shell_browser_context.h"	18 #include "content/shell/browser/shell_browser_context.h"

19 #include "extensions/browser/extension_registry.h"	19 #include "extensions/browser/extension_registry.h"

(...skipping 121 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141	141

142 const extensions::Extension* ShellContentBrowserClient::GetExtension(	142 const extensions::Extension* ShellContentBrowserClient::GetExtension(

143 content::SiteInstance* site_instance) {	143 content::SiteInstance* site_instance) {

144 ExtensionRegistry* registry =	144 ExtensionRegistry* registry =

145 ExtensionRegistry::Get(site_instance->GetBrowserContext());	145 ExtensionRegistry::Get(site_instance->GetBrowserContext());

146 return registry->enabled_extensions().GetExtensionOrAppByURL(	146 return registry->enabled_extensions().GetExtensionOrAppByURL(

147 site_instance->GetSiteURL());	147 site_instance->GetSiteURL());

148 }	148 }

149	149

150 } // namespace apps	150 } // namespace apps

OLD	NEW