diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 23:40:28 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 23:40:28 +0000 |
| commit | 7797d6124ea8aa23d4131a08da108782b48c03d3 (patch) | |
| tree | 068be60027f0b43aab416bbf2d63e9147ced0d45 /chrome/browser/ui | |
| parent | 781ab43e9fa29cb43ef7d55755cdd394c7474a7e (diff) | |
| download | chromium_src-7797d6124ea8aa23d4131a08da108782b48c03d3.zip chromium_src-7797d6124ea8aa23d4131a08da108782b48c03d3.tar.gz chromium_src-7797d6124ea8aa23d4131a08da108782b48c03d3.tar.bz2 | |
Restrict extension load error reporting to the same profile.
BUG=397970
TBR=finnur@chromium.org
Review URL: https://codereview.chromium.org/429543007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/extensions/extension_loader_handler.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/extensions/extension_loader_handler.h | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/extensions/extension_loader_handler.cc b/chrome/browser/ui/webui/extensions/extension_loader_handler.cc index 07928d7..4f87543 100644 --- a/chrome/browser/ui/webui/extensions/extension_loader_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.cc @@ -228,8 +228,14 @@ void ExtensionLoaderHandler::LoadUnpackedExtensionImpl( installer->Load(file_path); } -void ExtensionLoaderHandler::OnLoadFailure(const base::FilePath& file_path, - const std::string& error) { +void ExtensionLoaderHandler::OnLoadFailure( + content::BrowserContext* browser_context, + const base::FilePath& file_path, + const std::string& error) { + // Only show errors from our browser context. + if (web_ui()->GetWebContents()->GetBrowserContext() != browser_context) + return; + size_t line = 0u; size_t column = 0u; std::string regex = diff --git a/chrome/browser/ui/webui/extensions/extension_loader_handler.h b/chrome/browser/ui/webui/extensions/extension_loader_handler.h index 9372f93..ea4b1e1 100644 --- a/chrome/browser/ui/webui/extensions/extension_loader_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.h @@ -63,7 +63,8 @@ class ExtensionLoaderHandler : public content::WebUIMessageHandler, void LoadUnpackedExtensionImpl(const base::FilePath& file_path); // ExtensionErrorReporter::Observer: - virtual void OnLoadFailure(const base::FilePath& file_path, + virtual void OnLoadFailure(content::BrowserContext* browser_context, + const base::FilePath& file_path, const std::string& error) OVERRIDE; // content::WebContentsObserver: |