chrome/browser/extensions/shell_window_registry.cc - Issue 21344002: Move native_app_window code to apps areas

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

Unified Diff: chrome/browser/extensions/shell_window_registry.cc

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge error Created 7 years, 5 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:

Index: chrome/browser/extensions/shell_window_registry.cc

diff --git a/chrome/browser/extensions/shell_window_registry.cc b/chrome/browser/extensions/shell_window_registry.cc

index b9c939d1d090f9b86f7946149cf126bea8a5dc48..d4275af1c869ddcd8198d1f95c9e161a11715dfe 100644

--- a/chrome/browser/extensions/shell_window_registry.cc

+++ b/chrome/browser/extensions/shell_window_registry.cc

@@ -2,12 +2,12 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include "apps/native_app_window.h"

#include "apps/shell_window.h"

#include "chrome/browser/browser_process.h"

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

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

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

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

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

#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"

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