diff options
author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 21:40:08 +0000 |
---|---|---|
committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 21:40:08 +0000 |
commit | 00c8469e26c18b47981a92931acbc209efa8c3e4 (patch) | |
tree | 17c1576f6737ce4d49500baf3805b92a6e4e0af0 /ash/test | |
parent | 993951d6500d51ee010103c7f8727eaa900bd563 (diff) | |
download | chromium_src-00c8469e26c18b47981a92931acbc209efa8c3e4.zip chromium_src-00c8469e26c18b47981a92931acbc209efa8c3e4.tar.gz chromium_src-00c8469e26c18b47981a92931acbc209efa8c3e4.tar.bz2 |
This is the first of two patches to drag and drop items from the app list to the launcher.
Everything basically works with this patch, but two essential things are still missing:
1. The icon which gets dragged should get its own widget so that it can get visually dragged outside the app list.
2. The unit tests.
They will be send as a second patch because of:
a. The patch is already pretty big as it is.
b. I want to make get this "signed off" before continuing this route.
BUG=166429
TEST=visual, tests come with second patch
Review URL: https://chromiumcodereview.appspot.com/14533006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r-- | ash/test/test_launcher_delegate.cc | 11 | ||||
-rw-r--r-- | ash/test/test_launcher_delegate.h | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc index 16422e3..3a4fccd 100644 --- a/ash/test/test_launcher_delegate.cc +++ b/ash/test/test_launcher_delegate.cc @@ -131,5 +131,16 @@ bool TestLauncherDelegate::IsPerAppLauncher() { return true; } +LauncherID TestLauncherDelegate::GetLauncherIDForAppID( + const std::string& app_id) { + return 0; +} + +void TestLauncherDelegate::PinAppWithID(const std::string& app_id) { +} + +void TestLauncherDelegate::UnpinAppsWithID(const std::string& app_id) { +} + } // namespace test } // namespace ash diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h index b86b1e1..65dc634 100644 --- a/ash/test/test_launcher_delegate.h +++ b/ash/test/test_launcher_delegate.h @@ -51,6 +51,9 @@ class TestLauncherDelegate : public LauncherDelegate, virtual void OnLauncherCreated(Launcher* launcher) OVERRIDE; virtual void OnLauncherDestroyed(Launcher* launcher) OVERRIDE; virtual bool IsPerAppLauncher() OVERRIDE; + virtual LauncherID GetLauncherIDForAppID(const std::string& app_id) OVERRIDE; + virtual void PinAppWithID(const std::string& app_id) OVERRIDE; + virtual void UnpinAppsWithID(const std::string& app_id) OVERRIDE; private: typedef std::map<aura::Window*, ash::LauncherID> WindowToID; |