summaryrefslogtreecommitdiffstats
path: root/ash/shell/app_list.cc
diff options
context:
space:
mode:
authormgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 12:04:33 +0000
committermgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 12:04:33 +0000
commitd0c122efd20f7cc8e06d3fe8d35c03bbdca4fa8f (patch)
treea69cfc124708265fa288cef991a0221803567e0e /ash/shell/app_list.cc
parent387c79251b05f93ac8068674ac213e2e68460b8a (diff)
downloadchromium_src-d0c122efd20f7cc8e06d3fe8d35c03bbdca4fa8f.zip
chromium_src-d0c122efd20f7cc8e06d3fe8d35c03bbdca4fa8f.tar.gz
chromium_src-d0c122efd20f7cc8e06d3fe8d35c03bbdca4fa8f.tar.bz2
Added --custom-launcher-page. Adds a page to the experimental launcher.
This allows the user to specify a custom web page (which must be in the chrome-extension:// scheme) which will appear as a third top-level page in the experimental launcher, alongside the start and apps pages. This command-line switch is intended to be temporary; eventually, extensions will be able to specify their own custom launcher pages. For now, the command-line switch is sufficient for testing. Most of the Chrome APIs are not yet available for these pages. BUG=386004 TBR=mukai@chromium.org,jamescook@chromium.org Review URL: https://codereview.chromium.org/352033002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/app_list.cc')
-rw-r--r--ash/shell/app_list.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index df277d0..e396848 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -354,6 +354,10 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
return NULL;
}
+ virtual views::View* CreateCustomPageWebView(const gfx::Size& size) OVERRIDE {
+ return NULL;
+ }
+
virtual bool IsSpeechRecognitionEnabled() OVERRIDE {
return false;
}