chrome/browser/ui/ash/app_list/app_list_service_ash.cc - Issue 156803004: Merge 250467 "Revert of Add UMA to track app launcher discoverab..."

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/app_list/app_list_service_ash.cc

Issue 156803004: Merge 250467 "Revert of Add UMA to track app launcher discoverab..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1835/src/

Patch Set: Created 6 years, 10 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/app_list/app_list_service_unittest.cc ('k') | chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/app_list/app_list_service_ash.cc

===================================================================

--- chrome/browser/ui/ash/app_list/app_list_service_ash.cc (revision 250531)

+++ chrome/browser/ui/ash/app_list/app_list_service_ash.cc (working copy)

@@ -35,8 +35,7 @@

virtual void ShowForProfile(Profile* default_profile) OVERRIDE;

virtual bool IsAppListVisible() const OVERRIDE;

virtual void DismissAppList() OVERRIDE;

- virtual void EnableAppList(Profile* initial_profile,

- AppListEnableSource enable_source) OVERRIDE;

+ virtual void EnableAppList(Profile* initial_profile) OVERRIDE;

virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;

virtual Profile* GetCurrentAppListProfile() OVERRIDE;

virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE;

@@ -77,8 +76,7 @@

ash::Shell::GetInstance()->ToggleAppList(NULL);

}

-void AppListServiceAsh::EnableAppList(Profile* initial_profile,

- AppListEnableSource enable_source) {}

+void AppListServiceAsh::EnableAppList(Profile* initial_profile) {}

gfx::NativeWindow AppListServiceAsh::GetAppListWindow() {

if (ash::Shell::HasInstance())