diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 22:44:18 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 22:44:18 +0000 |
| commit | ca29b0f4d939b6ef56145e22b09946e816811774 (patch) | |
| tree | 51f862399dcddbbaf80fe132cee45d8fed73c2c2 /ash/test | |
| parent | b43ac91a06b77e171b60de4ecb3f47dea88adc2d (diff) | |
| download | chromium_src-ca29b0f4d939b6ef56145e22b09946e816811774.zip chromium_src-ca29b0f4d939b6ef56145e22b09946e816811774.tar.gz chromium_src-ca29b0f4d939b6ef56145e22b09946e816811774.tar.bz2 | |
Changing the order of items from LRU to creation order - and - as a result, moving the highlight of the current item from the top of the list to what ever is active.
BUG=178333
TEST=unittest
Review URL: https://chromiumcodereview.appspot.com/12374059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_launcher_delegate.cc | 2 | ||||
| -rw-r--r-- | ash/test/test_launcher_delegate.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc index 348c2ec..021aec09 100644 --- a/ash/test/test_launcher_delegate.cc +++ b/ash/test/test_launcher_delegate.cc @@ -86,7 +86,7 @@ ui::MenuModel* TestLauncherDelegate::CreateContextMenu( return NULL; } -ui::MenuModel* TestLauncherDelegate::CreateApplicationMenu( +ash::LauncherMenuModel* TestLauncherDelegate::CreateApplicationMenu( const ash::LauncherItem& item) { return NULL; } diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h index 365558c..7d8562e 100644 --- a/ash/test/test_launcher_delegate.h +++ b/ash/test/test_launcher_delegate.h @@ -42,7 +42,7 @@ class TestLauncherDelegate : public LauncherDelegate, virtual string16 GetTitle(const LauncherItem& item) OVERRIDE; virtual ui::MenuModel* CreateContextMenu(const LauncherItem& item, aura::RootWindow* root) OVERRIDE; - virtual ui::MenuModel* CreateApplicationMenu( + virtual ash::LauncherMenuModel* CreateApplicationMenu( const LauncherItem& item) OVERRIDE; virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE; virtual bool IsDraggable(const ash::LauncherItem& item) OVERRIDE; |