From 9c42337e64706082a768eac51f842da987f26e6f Mon Sep 17 00:00:00 2001 From: "simon.hong81@gmail.com" Date: Wed, 15 May 2013 12:59:26 +0000 Subject: Make chrome icon moveable 1) Added LauncherItemController for browser shortcut. 2) Merged Stefan's alt+n implementation. BUG=156953 TEST= unit_tests, ash_unittests, browser_tests Review URL: https://chromiumcodereview.appspot.com/11596003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200242 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/test/test_launcher_delegate.cc | 7 ------- ash/test/test_launcher_delegate.h | 2 -- 2 files changed, 9 deletions(-) (limited to 'ash/test') diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc index 3a4fccd..e71fd344 100644 --- a/ash/test/test_launcher_delegate.cc +++ b/ash/test/test_launcher_delegate.cc @@ -63,9 +63,6 @@ void TestLauncherDelegate::OnWillRemoveWindow(aura::Window* window) { } } -void TestLauncherDelegate::OnBrowserShortcutClicked(int event_flags) { -} - void TestLauncherDelegate::ItemSelected(const ash::LauncherItem& item, const ui::Event& event) { aura::Window* window = GetWindowByID(item.id); @@ -75,10 +72,6 @@ void TestLauncherDelegate::ItemSelected(const ash::LauncherItem& item, ash::wm::ActivateWindow(window); } -int TestLauncherDelegate::GetBrowserShortcutResourceId() { - return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT; -} - base::string16 TestLauncherDelegate::GetTitle(const ash::LauncherItem& item) { aura::Window* window = GetWindowByID(item.id); return window ? window->title() : base::string16(); diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h index 65dc634..60d7411 100644 --- a/ash/test/test_launcher_delegate.h +++ b/ash/test/test_launcher_delegate.h @@ -35,10 +35,8 @@ class TestLauncherDelegate : public LauncherDelegate, virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; // LauncherDelegate implementation. - virtual void OnBrowserShortcutClicked(int event_flags) OVERRIDE; virtual void ItemSelected(const LauncherItem& item, const ui::Event& event) OVERRIDE; - virtual int GetBrowserShortcutResourceId() OVERRIDE; virtual base::string16 GetTitle(const LauncherItem& item) OVERRIDE; virtual ui::MenuModel* CreateContextMenu(const LauncherItem& item, aura::RootWindow* root) OVERRIDE; -- cgit v1.1