chrome/browser/extensions/api/tabs/tabs_api.cc - Issue 494033002: Move AppWindow to extensions

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/api/tabs/tabs_api.cc

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove unneeded include in chrome_shell_delegate.cc 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:

Index: chrome/browser/extensions/api/tabs/tabs_api.cc

diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc

index f379b70d830d9b7581007013c03af8ec1e1dedc3..11ec2538c6922940bffa69cc308d47f54afcf2dd 100644

--- a/chrome/browser/extensions/api/tabs/tabs_api.cc

+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc

@@ -8,7 +8,6 @@

#include <limits>

#include <vector>

-#include "apps/app_window.h"

#include "base/bind.h"

#include "base/command_line.h"

#include "base/logging.h"

@@ -65,6 +64,7 @@

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

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

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

+#include "extensions/browser/app_window/app_window.h"

#include "extensions/browser/extension_function_dispatcher.h"

#include "extensions/browser/extension_function_util.h"

#include "extensions/browser/extension_host.h"

@@ -85,12 +85,11 @@

#include "ui/base/ui_base_types.h"

#if defined(USE_ASH)

-#include "apps/app_window_registry.h"

#include "ash/ash_switches.h"

#include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"

+#include "extensions/browser/app_window/app_window_registry.h"

#endif

-using apps::AppWindow;

using content::BrowserThread;

using content::NavigationController;

using content::NavigationEntry;