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

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

Download patch

« apps/shell_window.h ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc ('k') | chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc » ('j') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 703a8e526587f93dfcc5ed5746bbe54c0468f1b8..ab155fde31a23bf473da10b63856a1d8a1aa31d0 100644

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

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

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

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

+#include "apps/native_app_window.h"

#include "apps/shell_window.h"

#include "ash/wm/window_properties.h"

#include "ash/wm/window_util.h"

@@ -12,7 +13,6 @@

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

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

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

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

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

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

#include "ui/aura/window.h"