Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1328)

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.cc

Issue 10900018: Introduce App Launcher for Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First round of feedback Created 8 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
Index: chrome/browser/ui/app_list/app_list_view_delegate.cc
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index 67bc837695fbc6195487fd982f2d30b56d35c70c..ca223e9a6f08220b4cc1a7ad5c0d2365f7a9f290 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/app_list/app_list_view_delegate.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/app_list/apps_model_builder.h"
#include "chrome/browser/ui/app_list/chrome_app_list_item.h"
@@ -11,9 +12,13 @@
#include "content/public/browser/user_metrics.h"
AppListViewDelegate::AppListViewDelegate(AppListController* controller)
- : controller_(controller) {}
+ : controller_(controller) {
+ browser::StartKeepAlive();
+}
-AppListViewDelegate::~AppListViewDelegate() {}
+AppListViewDelegate::~AppListViewDelegate() {
+ browser::EndKeepAlive();
+}
void AppListViewDelegate::SetModel(app_list::AppListModel* model) {
if (model) {
@@ -68,3 +73,7 @@ void AppListViewDelegate::InvokeSearchResultAction(
void AppListViewDelegate::Close() {
controller_->CloseView();
}
+
+gfx::ImageSkia AppListViewDelegate::GetWindowAppIcon() {
+ return controller_->GetWindowAppIcon();
+}

Powered by Google App Engine
This is Rietveld 408576698