Adding business logic for dragging items from shelf to the desktop to unpin

The new feature has to be enabled by a new flag and this part of the implementation is ...
... adding the business logic to enable the dragging and removing.
... cleaning up a few things.
The still required changes are marked with TODO's accordingly.

BUG=249081
TEST=Unittest

Review URL: https://chromiumcodereview.appspot.com/23338004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219436 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 2 deletions

diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc
index ed3e517..047c2a9 100644
--- a/ash/test/test_launcher_delegate.cc
+++ b/ash/test/test_launcher_delegate.cc
@@ -7,6 +7,7 @@
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_util.h"
 #include "ash/wm/window_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/window.h"
@@ -131,6 +132,10 @@ LauncherID TestLauncherDelegate::GetLauncherIDForAppID(
   return 0;
 }
 
+const std::string& TestLauncherDelegate::GetAppIDForLauncherID(LauncherID id) {
+  return EmptyString();
+}
+
 void TestLauncherDelegate::PinAppWithID(const std::string& app_id) {
 }
 
@@ -138,7 +143,7 @@ bool TestLauncherDelegate::IsAppPinned(const std::string& app_id) {
   return false;
 }
 
-void TestLauncherDelegate::UnpinAppsWithID(const std::string& app_id) {
+void TestLauncherDelegate::UnpinAppWithID(const std::string& app_id) {
 }
 
 }  // namespace test
diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h
index 06d0cde..ae1ca7a 100644
--- a/ash/test/test_launcher_delegate.h
+++ b/ash/test/test_launcher_delegate.h
@@ -52,9 +52,10 @@ class TestLauncherDelegate : public LauncherDelegate,
   virtual void OnLauncherCreated(Launcher* launcher) OVERRIDE;
   virtual void OnLauncherDestroyed(Launcher* launcher) OVERRIDE;
   virtual LauncherID GetLauncherIDForAppID(const std::string& app_id) OVERRIDE;
+  virtual const std::string& GetAppIDForLauncherID(LauncherID id) OVERRIDE;
   virtual void PinAppWithID(const std::string& app_id) OVERRIDE;
   virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;
-  virtual void UnpinAppsWithID(const std::string& app_id) OVERRIDE;
+  virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE;
 
  private:
   typedef std::map<aura::Window*, ash::LauncherID> WindowToID;