diff options
author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-04-16 19:03:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 02:03:15 +0000 |
commit | c71afa04d83589ad954d99c721b2ef6388a3455d (patch) | |
tree | aca0cb8ab7e66735e451fc628acb408994983f3b /extensions/browser/app_window | |
parent | 32b3a84be9aa4f70e83bd47c2a5cb32f05ad7f7e (diff) | |
download | chromium_src-c71afa04d83589ad954d99c721b2ef6388a3455d.zip chromium_src-c71afa04d83589ad954d99c721b2ef6388a3455d.tar.gz chromium_src-c71afa04d83589ad954d99c721b2ef6388a3455d.tar.bz2 |
[Extensions UI] Observe developerPrivate events for extension views
Move all events relating to renderer views out of the ExtensionSettingsHandler,
and have the extensions page update from the developerPrivate API instead.
BUG=461039
Review URL: https://codereview.chromium.org/1086693005
Cr-Commit-Position: refs/heads/master@{#325586}
Diffstat (limited to 'extensions/browser/app_window')
-rw-r--r-- | extensions/browser/app_window/app_window.cc | 2 | ||||
-rw-r--r-- | extensions/browser/app_window/app_window.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc index fc56bae..5ca80d4 100644 --- a/extensions/browser/app_window/app_window.cc +++ b/extensions/browser/app_window/app_window.cc @@ -252,6 +252,8 @@ void AppWindow::Init(const GURL& url, app_window_contents_.reset(app_window_contents); app_window_contents_->Initialize(browser_context(), url); + initial_url_ = url; + content::WebContentsObserver::Observe(web_contents()); SetViewType(web_contents(), VIEW_TYPE_APP_WINDOW); app_delegate_->InitWebContents(web_contents()); diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h index e9679dc..df6b248 100644 --- a/extensions/browser/app_window/app_window.h +++ b/extensions/browser/app_window/app_window.h @@ -224,6 +224,7 @@ class AppWindow : public content::WebContentsDelegate, const GURL& app_icon_url() const { return app_icon_url_; } const gfx::Image& badge_icon() const { return badge_icon_; } const GURL& badge_icon_url() const { return badge_icon_url_; } + const GURL& initial_url() const { return initial_url_; } bool is_hidden() const { return is_hidden_; } const Extension* GetExtension() const; @@ -518,6 +519,9 @@ class AppWindow : public content::WebContentsDelegate, scoped_ptr<AppDelegate> app_delegate_; scoped_ptr<AppWebContentsHelper> helper_; + // 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_; |