summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorbenwells <benwells@chromium.org>2015-08-14 13:28:09 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-14 20:28:46 +0000
commit557e70f4371fce0f9bf5a6279237ba1723b984b2 (patch)
treeda52c300d33cb6a5e1e7f4201e86c6b4145f58ec /extensions
parent2a717ff2aa9fd0c27926fb8c8250633e44f91594 (diff)
downloadchromium_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')
-rw-r--r--extensions/browser/app_window/app_window.cc9
-rw-r--r--extensions/browser/app_window/app_window.h5
-rw-r--r--extensions/browser/app_window/native_app_window.h4
-rw-r--r--extensions/components/native_app_window/native_app_window_views.cc3
-rw-r--r--extensions/components/native_app_window/native_app_window_views.h1
-rw-r--r--extensions/shell/browser/shell_native_app_window.cc4
-rw-r--r--extensions/shell/browser/shell_native_app_window.h1
7 files changed, 0 insertions, 27 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;
diff --git a/extensions/components/native_app_window/native_app_window_views.cc b/extensions/components/native_app_window/native_app_window_views.cc
index 0233623..633c416 100644
--- a/extensions/components/native_app_window/native_app_window_views.cc
+++ b/extensions/components/native_app_window/native_app_window_views.cc
@@ -417,9 +417,6 @@ void NativeAppWindowViews::HideWithApp() {
void NativeAppWindowViews::ShowWithApp() {
}
-void NativeAppWindowViews::UpdateShelfMenu() {
-}
-
gfx::Size NativeAppWindowViews::GetContentMinimumSize() const {
return size_constraints_.GetMinimumSize();
}
diff --git a/extensions/components/native_app_window/native_app_window_views.h b/extensions/components/native_app_window/native_app_window_views.h
index c6bac37..c160d43 100644
--- a/extensions/components/native_app_window/native_app_window_views.h
+++ b/extensions/components/native_app_window/native_app_window_views.h
@@ -150,7 +150,6 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
gfx::Insets GetFrameInsets() const override;
void HideWithApp() override;
void ShowWithApp() override;
- void UpdateShelfMenu() override;
gfx::Size GetContentMinimumSize() const override;
gfx::Size GetContentMaximumSize() const override;
void SetContentSizeConstraints(const gfx::Size& min_size,
diff --git a/extensions/shell/browser/shell_native_app_window.cc b/extensions/shell/browser/shell_native_app_window.cc
index b5eb4f1..9113556 100644
--- a/extensions/shell/browser/shell_native_app_window.cc
+++ b/extensions/shell/browser/shell_native_app_window.cc
@@ -174,10 +174,6 @@ void ShellNativeAppWindow::HideWithApp() {
NOTIMPLEMENTED();
}
-void ShellNativeAppWindow::UpdateShelfMenu() {
- // app_shell has no shelf, dock, or system-tray to update.
-}
-
gfx::Size ShellNativeAppWindow::GetContentMinimumSize() const {
// Content fills the desktop and cannot be resized.
return DesktopController::instance()->GetWindowSize();
diff --git a/extensions/shell/browser/shell_native_app_window.h b/extensions/shell/browser/shell_native_app_window.h
index 42b0dd4..2dabbfe 100644
--- a/extensions/shell/browser/shell_native_app_window.h
+++ b/extensions/shell/browser/shell_native_app_window.h
@@ -62,7 +62,6 @@ class ShellNativeAppWindow : public NativeAppWindow {
gfx::Insets GetFrameInsets() const override;
void ShowWithApp() override;
void HideWithApp() override;
- void UpdateShelfMenu() override;
gfx::Size GetContentMinimumSize() const override;
gfx::Size GetContentMaximumSize() const override;
void SetContentSizeConstraints(const gfx::Size& min_size,