chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h - 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.h

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_tab.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc » ('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.h

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

index 391ae26c25ff200554c6a62376cd7f2c36cc18df..c195b0e404d1181f89a1e4606a0dac9abc0d81e0 100644

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

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

@@ -13,7 +13,7 @@ namespace gfx {

class image;

}

-class ChromeLauncherControllerPerApp;

+class ChromeLauncherController;

// A menu item controller for a running V2 application. It gets created when an

// application list gets created. It's main purpose is to add the activation

@@ -24,7 +24,7 @@ class ChromeLauncherAppMenuItemV2App : public ChromeLauncherAppMenuItem {

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);

virtual bool IsEnabled() const OVERRIDE;

@@ -32,7 +32,7 @@ class ChromeLauncherAppMenuItemV2App : public ChromeLauncherAppMenuItem {

private:

// The owning class which can be used to validate the controller.

- ChromeLauncherControllerPerApp* launcher_controller_;

+ ChromeLauncherController* launcher_controller_;

// The application ID.

const std::string app_id_;