chrome/browser/ui/ash/chrome_shell_delegate.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/chrome_shell_delegate.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/chrome_shell_delegate.cc

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

index 2a22df049346c5c0a651e9c9586f9557d5d4fcd7..ad016780c2140f80903150ccf35d855ea13bf8ad 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -30,7 +30,7 @@

#include "chrome/browser/ui/app_list/app_list_view_delegate.h"

#include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"

#include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.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/launcher_context_menu.h"

#include "chrome/browser/ui/ash/user_action_handler.h"

#include "chrome/browser/ui/ash/window_positioner.h"