diff options
| author | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 15:18:55 +0000 |
|---|---|---|
| committer | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 15:20:40 +0000 |
| commit | 9b770aef7f564353654f3eec70e599ece6692955 (patch) | |
| tree | c7deea2db2c5e0852b293b0c1436b6351962232f /ash/shell/app_list.cc | |
| parent | db0f0c91630189937fd7cc627c2e6766fa8783ba (diff) | |
| download | chromium_src-9b770aef7f564353654f3eec70e599ece6692955.zip chromium_src-9b770aef7f564353654f3eec70e599ece6692955.tar.gz chromium_src-9b770aef7f564353654f3eec70e599ece6692955.tar.bz2 | |
App list: Infrastructure now supports multiple custom launcher pages.
AppListTestViewDelegate::CreateCustomPageWebViews now returns a vector
of views, not a single view. AppListViewDelegate is now able to generate
multiple custom launcher pages which will all be inserted into the
launcher (but currently only ever produces a single one, from the
--custom-launcher-page switch).
BUG=399131
Review URL: https://codereview.chromium.org/441873004
Cr-Commit-Position: refs/heads/master@{#288975}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/app_list.cc')
| -rw-r--r-- | ash/shell/app_list.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index f835153..1d8eb80 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 { |