diff options
| author | benwells <benwells@chromium.org> | 2015-08-14 13:28:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-14 20:28:46 +0000 |
| commit | 557e70f4371fce0f9bf5a6279237ba1723b984b2 (patch) | |
| tree | da52c300d33cb6a5e1e7f4201e86c6b4145f58ec /extensions/browser/app_window | |
| parent | 2a717ff2aa9fd0c27926fb8c8250633e44f91594 (diff) | |
| download | chromium_src-557e70f4371fce0f9bf5a6279237ba1723b984b2.zip chromium_src-557e70f4371fce0f9bf5a6279237ba1723b984b2.tar.gz chromium_src-557e70f4371fce0f9bf5a6279237ba1723b984b2.tar.bz2 | |
Remove menu from ash / Windows shelf / taskbar to install ephemeral app.
BUG=517735
Review URL: https://codereview.chromium.org/1290303002
Cr-Commit-Position: refs/heads/master@{#343476}
Diffstat (limited to 'extensions/browser/app_window')
| -rw-r--r-- | extensions/browser/app_window/app_window.cc | 9 | ||||
| -rw-r--r-- | extensions/browser/app_window/app_window.h | 5 | ||||
| -rw-r--r-- | extensions/browser/app_window/native_app_window.h | 4 |
3 files changed, 0 insertions, 18 deletions
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc index ad0a0f5..575062b 100644 --- a/extensions/browser/app_window/app_window.cc +++ b/extensions/browser/app_window/app_window.cc @@ -960,15 +960,6 @@ void AppWindow::OnExtensionUnloaded(BrowserContext* browser_context, native_app_window_->Close(); } -void AppWindow::OnExtensionWillBeInstalled( - BrowserContext* browser_context, - const Extension* extension, - bool is_update, - bool from_ephemeral, - const std::string& old_name) { - if (extension->id() == extension_id()) - native_app_window_->UpdateShelfMenu(); -} void AppWindow::SetWebContentsBlocked(content::WebContents* web_contents, bool blocked) { app_delegate_->SetWebContentsBlocked(web_contents, blocked); diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h index e92c553..449a729 100644 --- a/extensions/browser/app_window/app_window.h +++ b/extensions/browser/app_window/app_window.h @@ -422,11 +422,6 @@ class AppWindow : public content::WebContentsDelegate, void OnExtensionUnloaded(content::BrowserContext* browser_context, const Extension* extension, UnloadedExtensionInfo::Reason reason) override; - void OnExtensionWillBeInstalled(content::BrowserContext* browser_context, - const Extension* extension, - bool is_update, - bool from_ephemeral, - const std::string& old_name) override; // web_modal::WebContentsModalDialogManagerDelegate implementation. void SetWebContentsBlocked(content::WebContents* web_contents, diff --git a/extensions/browser/app_window/native_app_window.h b/extensions/browser/app_window/native_app_window.h index fda44ed..3ad9142 100644 --- a/extensions/browser/app_window/native_app_window.h +++ b/extensions/browser/app_window/native_app_window.h @@ -79,10 +79,6 @@ class NativeAppWindow : public ui::BaseWindow, virtual void ShowWithApp() = 0; virtual void HideWithApp() = 0; - // Updates custom entries for the context menu of the app's taskbar/dock/shelf - // icon. - virtual void UpdateShelfMenu() = 0; - // Returns the minimum size constraints of the content. virtual gfx::Size GetContentMinimumSize() const = 0; |