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

Unified Diff: ash/shell/app_list.cc

Issue 441873004: App list: Infrastructure now supports multiple custom launcher pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix typo. Created 6 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 | « no previous file | athena/home/app_list_view_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/app_list.cc
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index f8351532d384a5956fc608cf62d1eb18c02fc8d1..1d8eb80eca1d867d7d0bb945a33fd3c204d86a3b 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <string>
+#include <vector>
#include "ash/session/session_state_delegate.h"
#include "ash/shell.h"
@@ -353,8 +354,9 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
return NULL;
}
- virtual views::View* CreateCustomPageWebView(const gfx::Size& size) OVERRIDE {
- return NULL;
+ virtual std::vector<views::View*> CreateCustomPageWebViews(
+ const gfx::Size& size) OVERRIDE {
+ return std::vector<views::View*>();
}
virtual bool IsSpeechRecognitionEnabled() OVERRIDE {
« no previous file with comments | « no previous file | athena/home/app_list_view_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698