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

Unified Diff: chrome/browser/ui/app_list/extension_app_item.cc

Issue 846913003: Don't show shortcut arrow on hosted apps on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/extension_app_item.cc
diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
index 9ecbdab008de4f9fd29fc5593541833d05a388ca..f75fb52fbc5fd608d59f40b1027e20c87cdc1fc2 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -145,14 +145,12 @@ ExtensionAppItem::~ExtensionAppItem() {
}
bool ExtensionAppItem::NeedsOverlay() const {
- // The overlay icon is disabled for hosted apps in windowed mode with
- // streamlined hosted apps.
- bool streamlined_hosted_apps =
- extensions::util::IsStreamlinedHostedAppsEnabled();
#if defined(OS_CHROMEOS)
- if (!streamlined_hosted_apps)
- return false;
+ // The overlay is disabled completely in ChromeOS.
+ return false;
#endif
Matt Giuca 2015/01/22 06:39:54 nit: Blank line after this.
benwells 2015/01/22 07:03:23 Done.
+ // The overlay icon is disabled for hosted apps in windowed mode with
+ // streamlined hosted apps.
Matt Giuca 2015/01/22 06:39:54 Move this comment to just above the return.
benwells 2015/01/22 07:03:23 Done.
extensions::LaunchType launch_type =
GetExtension()
? extensions::GetLaunchType(extensions::ExtensionPrefs::Get(profile_),
@@ -160,7 +158,7 @@ bool ExtensionAppItem::NeedsOverlay() const {
: extensions::LAUNCH_TYPE_WINDOW;
return !is_platform_app_ && extension_id_ != extension_misc::kChromeAppId &&
- (!streamlined_hosted_apps ||
+ (!extensions::util::IsStreamlinedHostedAppsEnabled() ||
launch_type != extensions::LAUNCH_TYPE_WINDOW);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698