chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc - Issue 23068021: Remove PerBrowser launcher, reland step 1 of 2

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 23068021: Remove PerBrowser launcher, reland step 1 of 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/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 618397c9e069eac5416cbb34c08db1e6f3c3d668..cfd5a010e226386837d857724083b8e1cc81caff 100644

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

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

@@ -9,7 +9,7 @@

#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/chrome_launcher_controller_per_app.h"

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

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