chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc - Issue 22887015: Remove PerBrowser launcher

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/chrome_launcher_app_menu_item_v2app.cc

Issue 22887015: Remove PerBrowser launcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix nit 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:

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

Download patch

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

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

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

index d85c90b498852595d4d3da5e9662370ea6b1e522..fe6546c59ddb5526c1d3948e0eadf6ca7479b899 100644

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

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

@@ -4,13 +4,13 @@

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

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

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

ChromeLauncherAppMenuItemV2App::ChromeLauncherAppMenuItemV2App(

const string16 title,

const gfx::Image* icon,

const std::string& app_id,

- ChromeLauncherControllerPerApp* launcher_controller,

+ ChromeLauncherController* launcher_controller,

int app_index,

bool has_leading_separator)

: ChromeLauncherAppMenuItem(title, icon, has_leading_separator),