chrome/browser/extensions/api/tabs/ash_panel_contents.cc - Issue 479933003: Move NativeAppWindow 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/ash_panel_contents.cc

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

Patch Set: 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/ash_panel_contents.cc

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

index 8fd853499c8a6324bc2719f6c25df2e38fe1e94f..1750c01b276010095c0fac800e1eccbd9c71c741 100644

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

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

@@ -4,7 +4,6 @@

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

-#include "apps/ui/native_app_window.h"

#include "base/values.h"

#include "chrome/browser/chrome_notification_types.h"

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

@@ -17,12 +16,13 @@

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

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

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

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

#include "extensions/common/extension.h"

#include "extensions/common/extension_messages.h"

#include "ui/gfx/image/image.h"

using apps::AppWindow;

-using apps::NativeAppWindow;

+using extensions::NativeAppWindow;

// AshPanelWindowController ----------------------------------------------------