From 6fa1822b68c9249e7d4306d5216726e45177f653 Mon Sep 17 00:00:00 2001 From: "zea@chromium.org" Date: Fri, 18 May 2012 22:03:38 +0000 Subject: Revert 137968 - Adding four bezel gestures Reverted due to compile failure on Linux CrOS BUG=126061, 126060, 123167 TEST=Unit test Review URL: https://chromiumcodereview.appspot.com/10383108 TBR=skuhne@chromium.org Review URL: https://chromiumcodereview.appspot.com/10412012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137970 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/test/test_launcher_delegate.cc | 7 ------- ash/test/test_launcher_delegate.h | 1 - 2 files changed, 8 deletions(-) (limited to 'ash/test') diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc index cec42a7..bb5f0d2 100644 --- a/ash/test/test_launcher_delegate.cc +++ b/ash/test/test_launcher_delegate.cc @@ -26,19 +26,12 @@ TestLauncherDelegate::~TestLauncherDelegate() { } void TestLauncherDelegate::AddLauncherItem(aura::Window* window) { - AddLauncherItem(window, STATUS_CLOSED); -} - -void TestLauncherDelegate::AddLauncherItem( - aura::Window* window, - LauncherItemStatus status) { ash::LauncherItem item; item.type = ash::TYPE_TABBED; DCHECK(window_to_id_.find(window) == window_to_id_.end()); window_to_id_[window] = model_->next_id(); item.image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); item.image.allocPixels(); - item.status = status; model_->Add(item); if (observed_windows_.find(window->parent()) == observed_windows_.end()) { window->parent()->AddObserver(this); diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h index f56be8f..7cc0203 100644 --- a/ash/test/test_launcher_delegate.h +++ b/ash/test/test_launcher_delegate.h @@ -28,7 +28,6 @@ class TestLauncherDelegate : public LauncherDelegate, virtual ~TestLauncherDelegate(); void AddLauncherItem(aura::Window* window); - void AddLauncherItem(aura::Window* window, LauncherItemStatus status); static TestLauncherDelegate* instance() { return instance_; } -- cgit v1.1