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

Unified Diff: chrome/browser/ui/views/app_list/app_list_controller_win.cc

Issue 12090110: Show an icon to launch Chrome (chrome_app) on the Windows App Launcher. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix case where chrome is not default browser, fix ordering Created 7 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 | « chrome/browser/resources/chrome_app/manifest.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/app_list/app_list_controller_win.cc
diff --git a/chrome/browser/ui/views/app_list/app_list_controller_win.cc b/chrome/browser/ui/views/app_list/app_list_controller_win.cc
index 530dfae0b251082fe44a527ca9af32a4bcd79464..5b357c39a47a61731f9b8048c6766fd39c66b6cb 100644
--- a/chrome/browser/ui/views/app_list/app_list_controller_win.cc
+++ b/chrome/browser/ui/views/app_list/app_list_controller_win.cc
@@ -276,7 +276,9 @@ void AppListControllerDelegateWin::LaunchApp(
// browser; otherwise launch in chrome
// - v1 packaged apps : open in an app window
// - v2 packaged apps : launch normally
- if (extension->is_hosted_app()) {
+ // Note: a special case, the ChromeApp, should always launch Chrome.
+ if (extension->is_hosted_app() &&
+ extension->id() != extension_misc::kChromeAppId) {
content::BrowserThread::PostTask(
content::BrowserThread::FILE,
FROM_HERE,
« no previous file with comments | « chrome/browser/resources/chrome_app/manifest.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698