chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.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/ui/ash/launcher/app_window_launcher_item_controller.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

index fc61bab75316720cea11fb2800c0639c1046aaf1..d4e9a54342663dc13c80a223d1fe22ca7f3a6336 100644

--- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

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

#include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"

-#include "apps/app_window.h"

#include "ash/shelf/shelf_model.h"

#include "ash/wm/window_state.h"

#include "ash/wm/window_util.h"

@@ -17,6 +16,7 @@

#include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"

#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"

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

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

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

#include "skia/ext/image_operations.h"

#include "ui/aura/client/aura_constants.h"

@@ -25,7 +25,7 @@

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

#include "ui/wm/core/window_animations.h"

-using apps::AppWindow;

+using extensions::AppWindow;

namespace {