diff options
| author | jyasskin@chromium.org <jyasskin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-30 02:52:07 +0000 |
|---|---|---|
| committer | jyasskin@chromium.org <jyasskin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-30 02:52:07 +0000 |
| commit | 466f5e29eba257623962f12295fa994aac3b81a3 (patch) | |
| tree | 978e30934ddf8d9038b5cec2306494ed057f22e0 /chrome/browser/extensions/test_extension_system.cc | |
| parent | c5a970ce1208bb4f10ab2bee4c631493d3f78bec (diff) | |
| download | chromium_src-466f5e29eba257623962f12295fa994aac3b81a3.zip chromium_src-466f5e29eba257623962f12295fa994aac3b81a3.tar.gz chromium_src-466f5e29eba257623962f12295fa994aac3b81a3.tar.bz2 | |
Move the PageAction parts of ExtensionTabHelper::DidNavigateMainFrame to the PageActionController.
Test that the page actions are reset on navigation.
Review URL: https://chromiumcodereview.appspot.com/10685007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/test_extension_system.cc')
| -rw-r--r-- | chrome/browser/extensions/test_extension_system.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index 8fbb699..51543a3 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -22,7 +22,8 @@ TestExtensionSystem::TestExtensionSystem(Profile* profile) - : profile_(profile) { + : profile_(profile), + info_map_(new ExtensionInfoMap()) { } TestExtensionSystem::~TestExtensionSystem() { @@ -111,7 +112,7 @@ extensions::StateStore* TestExtensionSystem::state_store() { } ExtensionInfoMap* TestExtensionSystem::info_map() { - return NULL; + return info_map_.get(); } extensions::LazyBackgroundTaskQueue* |