Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

Issue 282103003: Moved IS_EPHEMERAL flag to extension prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix up file header Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
index dd90d061d33b84a59797a7e182cdb8a6be80fbf6..ad4d8acd30dd043ecbd315fcb731c4e8568fafba 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
@@ -26,6 +26,7 @@
#include "chrome/common/chrome_icon_resources_win.h"
#include "chrome/common/chrome_switches.h"
#include "content/public/browser/browser_thread.h"
+#include "extensions/browser/extension_util.h"
#include "extensions/common/extension.h"
#include "grit/generated_resources.h"
#include "ui/aura/remote_window_tree_host_win.h"
@@ -230,7 +231,8 @@ void ChromeNativeAppWindowViewsWin::UpdateShelfMenu() {
return;
// Add item to install ephemeral apps.
- if (extension->is_ephemeral()) {
+ if (extensions::util::IsEphemeralApp(extension->id(),
+ app_window()->browser_context())) {
scoped_refptr<ShellLinkItem> link(new ShellLinkItem());
link->set_title(l10n_util::GetStringUTF16(IDS_APP_INSTALL_TITLE));
link->set_icon(chrome_path.value(),
@@ -245,5 +247,6 @@ void ChromeNativeAppWindowViewsWin::UpdateShelfMenu() {
jumplist_updater.AddTasks(items);
}
+ // Note that an empty jumplist must still be committed to clear all items.
jumplist_updater.CommitUpdate();
}
« no previous file with comments | « chrome/browser/ui/panels/base_panel_browser_test.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698