diff options
| author | rouslan <rouslan@chromium.org> | 2015-07-27 12:45:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-27 19:46:55 +0000 |
| commit | cd3b9842dde7f32cb7f32199548173601b2118ce (patch) | |
| tree | 6a0f776c46cab619e1fd9a7d84e65d4d49851981 /extensions/browser/app_window | |
| parent | 8f3218985dde74063ccc362da47803be163f3165 (diff) | |
| download | chromium_src-cd3b9842dde7f32cb7f32199548173601b2118ce.zip chromium_src-cd3b9842dde7f32cb7f32199548173601b2118ce.tar.gz chromium_src-cd3b9842dde7f32cb7f32199548173601b2118ce.tar.bz2 | |
Remove PopupManager from src/components/web_modal/.
WebContentsModalDialogManager handles all dialogs.
BUG=496955
Review URL: https://codereview.chromium.org/1213613007
Cr-Commit-Position: refs/heads/master@{#340536}
Diffstat (limited to 'extensions/browser/app_window')
| -rw-r--r-- | extensions/browser/app_window/app_window.cc | 4 | ||||
| -rw-r--r-- | extensions/browser/app_window/app_window.h | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc index fb99b1b..f621ef5 100644 --- a/extensions/browser/app_window/app_window.cc +++ b/extensions/browser/app_window/app_window.cc @@ -289,10 +289,6 @@ void AppWindow::Init(const GURL& url, helper_.reset(new AppWebContentsHelper( browser_context_, extension_id_, web_contents(), app_delegate_.get())); - popup_manager_.reset( - new web_modal::PopupManager(GetWebContentsModalDialogHost())); - popup_manager_->RegisterWith(web_contents()); - UpdateExtensionAppIcon(); AppWindowRegistry::Get(browser_context_)->AddAppWindow(this); diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h index 12eb78d..e92c553 100644 --- a/extensions/browser/app_window/app_window.h +++ b/extensions/browser/app_window/app_window.h @@ -11,7 +11,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "components/sessions/session_id.h" -#include "components/web_modal/popup_manager.h" #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" @@ -514,10 +513,6 @@ class AppWindow : public content::WebContentsDelegate, // The initial url this AppWindow was navigated to. GURL initial_url_; - // Manages popup windows (bubbles, tab-modals) visible overlapping the - // app window. - scoped_ptr<web_modal::PopupManager> popup_manager_; - // Bit field of FullscreenType. int fullscreen_types_; |