chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc - Issue 16702003: Move ShellWindow into apps component.

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_controller.cc

Issue 16702003: Move ShellWindow into apps component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: yar Created 7 years, 6 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/ui/ash/launcher/shell_window_launcher_controller.cc

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

index ffad984e3acb7bbde863805bc8d22a92b1aed002..779a8f9d522e1f5091f6a98098e15b8679e01d23 100644

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

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

@@ -4,15 +4,17 @@

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

+#include "apps/shell_window.h"

#include "ash/shell.h"

#include "ash/wm/window_util.h"

#include "base/stl_util.h"

#include "base/strings/stringprintf.h"

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

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

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

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

+using apps::ShellWindow;

namespace {

std::string GetAppLauncherId(ShellWindow* shell_window) {