ui/app_list/views/app_list_main_view.cc - Issue 25859005: Elim ActivateAppListItem, ChromeAppListItem

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: ui/app_list/views/app_list_main_view.cc

Issue 25859005: Elim ActivateAppListItem, ChromeAppListItem (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix static cast in AppModelBuilder, add AppType Created 7 years, 2 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: ui/app_list/views/app_list_main_view.cc

diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc

index aab69df6e76793f1f14f80ee908334ed30c1f92e..65c0e4b220a2d321ae65185166bb215de0239abb 100644

--- a/ui/app_list/views/app_list_main_view.cc

+++ b/ui/app_list/views/app_list_main_view.cc

@@ -11,6 +11,7 @@

#include "base/files/file_path.h"

#include "base/message_loop/message_loop.h"

#include "base/strings/string_util.h"

+#include "content/public/browser/user_metrics.h"

#include "ui/app_list/app_list_constants.h"

#include "ui/app_list/app_list_item_model.h"

#include "ui/app_list/app_list_model.h"

@@ -186,8 +187,8 @@ void AppListMainView::OnItemIconLoaded(IconLoader* loader) {

}

void AppListMainView::ActivateApp(AppListItemModel* item, int event_flags) {

- if (delegate_)

- delegate_->ActivateAppListItem(item, event_flags);

+ content::RecordAction(content::UserMetricsAction("AppList_ClickOnApp"));

+ item->Activate(event_flags);

}

void AppListMainView::GetShortcutPathForApp(