summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 13:11:30 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 13:11:30 +0000
commit9f584e6a7f828816c9c6c0ba0ee822eb01fc3a06 (patch)
tree1be6fe88f5577d7c395dd3bf0c2cb255f03b9d81 /ash/shell
parente3270f1d393a374f3d60ffb532ec5d78ee674669 (diff)
downloadchromium_src-9f584e6a7f828816c9c6c0ba0ee822eb01fc3a06.zip
chromium_src-9f584e6a7f828816c9c6c0ba0ee822eb01fc3a06.tar.gz
chromium_src-9f584e6a7f828816c9c6c0ba0ee822eb01fc3a06.tar.bz2
Revert 178795
Speculative revert to see whether this is responsible for CaptivePortalBrowserTest failures. Tests are failing because there are more navigations happening than expected. > Added signin support for the app launcher. > > This prompts the user to sign in if the app launcher is shown and there is no authenticated user in the Chrome profile. This does not happen on ChromeOS. > > BUG=159733 > > > Review URL: https://chromiumcodereview.appspot.com/12044002 TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/12052077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/app_list.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index 59f79f2..daaa486 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -227,10 +227,6 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
DecorateSearchBox(model_->search_box());
}
- virtual app_list::SigninDelegate* GetSigninDelegate() OVERRIDE {
- return NULL;
- }
-
virtual void ActivateAppListItem(app_list::AppListItemModel* item,
int event_flags) OVERRIDE {
static_cast<WindowTypeLauncherItem*>(item)->Activate(event_flags);