diff options
| author | rockot <rockot@chromium.org> | 2015-08-14 19:57:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-15 02:58:16 +0000 |
| commit | 49e40cc11f68ffe6ede21f0c3e1db0239d456a7a (patch) | |
| tree | 53a9455581d3de8b85764d259a50fb727f747aa4 /chrome/browser/extensions/api/tabs | |
| parent | 8b605f21c02e8e920dcd7b26aa9716bb8ed751ad (diff) | |
| download | chromium_src-49e40cc11f68ffe6ede21f0c3e1db0239d456a7a.zip chromium_src-49e40cc11f68ffe6ede21f0c3e1db0239d456a7a.tar.gz chromium_src-49e40cc11f68ffe6ede21f0c3e1db0239d456a7a.tar.bz2 | |
Ensure proper ordering of app window request block/unblock
This fixes a race in app window initialization which could
cause resources to be permanently blocked from loading on
behalf of the renderer.
BUG=520750
TBR=kalman@chromium.org for tabs
TBR=nasko@chromium.org for IPC message (symbol rename only)
Review URL: https://codereview.chromium.org/1294923002
Cr-Commit-Position: refs/heads/master@{#343552}
Diffstat (limited to 'chrome/browser/extensions/api/tabs')
| -rw-r--r-- | chrome/browser/extensions/api/tabs/ash_panel_contents.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/tabs/ash_panel_contents.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc index a4422ea..ac891e4 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc @@ -69,6 +69,8 @@ void AshPanelContents::NativeWindowClosed() { void AshPanelContents::DispatchWindowShownForTests() const { } +void AshPanelContents::OnWindowReady() {} + content::WebContents* AshPanelContents::GetWebContents() const { return web_contents_.get(); } diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h index 417d6e3..4155a56 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.h +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.h @@ -41,6 +41,7 @@ class AshPanelContents extensions::NativeAppWindow* native_app_window) override; void NativeWindowClosed() override; void DispatchWindowShownForTests() const override; + void OnWindowReady() override; content::WebContents* GetWebContents() const override; extensions::WindowController* GetWindowController() const override; |