diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 17:54:44 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 17:54:44 +0000 |
| commit | 33a85f181bf099afe9067d50277ea0e85e35f302 (patch) | |
| tree | 75b111393ef958b010c88ade0edba5fd3f811937 /views | |
| parent | 55a7e5483376a196d3ba2f20ef56223d72f5a915 (diff) | |
| download | chromium_src-33a85f181bf099afe9067d50277ea0e85e35f302.zip chromium_src-33a85f181bf099afe9067d50277ea0e85e35f302.tar.gz chromium_src-33a85f181bf099afe9067d50277ea0e85e35f302.tar.bz2 | |
Lands http://codereview.chromium.org/2928005/ for Dill:
Loads favicons when openning back/forward menu for any urls that don't
have favicons.
BUG=5679
TEST=Restore a tab with a navigation history, check favicons.
Review URL: http://codereview.chromium.org/6708029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/view_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 2bded07..428f320 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -1232,7 +1232,7 @@ class MockMenuModel : public MenuModel { ui::Accelerator* accelerator)); MOCK_CONST_METHOD1(IsItemCheckedAt, bool(int index)); MOCK_CONST_METHOD1(GetGroupIdAt, int(int index)); - MOCK_CONST_METHOD2(GetIconAt, bool(int index, SkBitmap* icon)); + MOCK_METHOD2(GetIconAt, bool(int index, SkBitmap* icon)); MOCK_CONST_METHOD1(GetButtonMenuItemAt, ButtonMenuItemModel*(int index)); MOCK_CONST_METHOD1(IsEnabledAt, bool(int index)); MOCK_CONST_METHOD1(IsVisibleAt, bool(int index)); @@ -1243,6 +1243,7 @@ class MockMenuModel : public MenuModel { int disposition)); MOCK_METHOD0(MenuWillShow, void()); MOCK_METHOD0(MenuClosed, void()); + MOCK_METHOD1(SetMenuModelDelegate, void(MenuModelDelegate* delegate)); MOCK_METHOD3(GetModelAndIndexForCommandId, bool(int command_id, MenuModel** model, int* index)); }; |