trunk/src/chrome/browser/extensions/shell_window_registry.cc - Issue 22355002: Revert 215753 "Move native_app_window code to apps areas"

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: trunk/src/chrome/browser/extensions/shell_window_registry.cc

Issue 22355002: Revert 215753 "Move native_app_window code to apps areas" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 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 | « trunk/src/chrome/browser/extensions/platform_app_browsertest_util.cc ('k') | trunk/src/chrome/browser/ui/apps/chrome_shell_window_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "apps/native_app_window.h"

6 #include "apps/shell_window.h"	5 #include "apps/shell_window.h"

7 #include "chrome/browser/browser_process.h"	6 #include "chrome/browser/browser_process.h"

8 #include "chrome/browser/extensions/shell_window_registry.h"	7 #include "chrome/browser/extensions/shell_window_registry.h"

9 #include "chrome/browser/profiles/incognito_helpers.h"	8 #include "chrome/browser/profiles/incognito_helpers.h"

10 #include "chrome/browser/profiles/profile_manager.h"	9 #include "chrome/browser/profiles/profile_manager.h"

	10 #include "chrome/browser/ui/extensions/native_app_window.h"

11 #include "chrome/common/extensions/extension.h"	11 #include "chrome/common/extensions/extension.h"

12 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"	12 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"

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

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

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

16 #include "content/public/browser/render_view_host.h"	16 #include "content/public/browser/render_view_host.h"

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

18 #include "content/public/browser/web_contents.h"	18 #include "content/public/browser/web_contents.h"

19	19

20 using apps::ShellWindow;	20 using apps::ShellWindow;

(...skipping 277 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
298 bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() const {	298 bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() const {

299 return false;	299 return false;

300 }	300 }

301	301

302 content::BrowserContext* ShellWindowRegistry::Factory::GetBrowserContextToUse(	302 content::BrowserContext* ShellWindowRegistry::Factory::GetBrowserContextToUse(

303 content::BrowserContext* context) const {	303 content::BrowserContext* context) const {

304 return chrome::GetBrowserContextRedirectedInIncognito(context);	304 return chrome::GetBrowserContextRedirectedInIncognito(context);

305 }	305 }

306	306

307 } // namespace extensions	307 } // namespace extensions

OLD	NEW