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

Side by Side Diff: chrome/browser/web_applications/web_app_win.cc

Issue 1405993006: Revert of Change shortcut install location to non-subdir. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/web_applications/web_app.h ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/web_applications/web_app_win.h" 5 #include "chrome/browser/web_applications/web_app_win.h"
6 6
7 #include <shlobj.h> 7 #include <shlobj.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_enumerator.h" 10 #include "base/files/file_enumerator.h"
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 ShellUtil::ShortcutLocation location_id; 566 ShellUtil::ShortcutLocation location_id;
567 } locations[] = { 567 } locations[] = {
568 { 568 {
569 creation_locations.on_desktop, 569 creation_locations.on_desktop,
570 ShellUtil::SHORTCUT_LOCATION_DESKTOP 570 ShellUtil::SHORTCUT_LOCATION_DESKTOP
571 }, { 571 }, {
572 creation_locations.applications_menu_location == APP_MENU_LOCATION_ROOT, 572 creation_locations.applications_menu_location == APP_MENU_LOCATION_ROOT,
573 ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT 573 ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT
574 }, { 574 }, {
575 creation_locations.applications_menu_location == 575 creation_locations.applications_menu_location ==
576 APP_MENU_LOCATION_SUBDIR_CHROME_DEPRECATED, 576 APP_MENU_LOCATION_SUBDIR_CHROME,
577 ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED 577 ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR
578 }, { 578 }, {
579 creation_locations.applications_menu_location == 579 creation_locations.applications_menu_location ==
580 APP_MENU_LOCATION_SUBDIR_CHROMEAPPS, 580 APP_MENU_LOCATION_SUBDIR_CHROMEAPPS,
581 ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR 581 ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR
582 }, { 582 }, {
583 // For Win7+, |in_quick_launch_bar| indicates that we are pinning to 583 // For Win7+, |in_quick_launch_bar| indicates that we are pinning to
584 // taskbar. This needs to be handled by callers. 584 // taskbar. This needs to be handled by callers.
585 creation_locations.in_quick_launch_bar && 585 creation_locations.in_quick_launch_bar &&
586 base::win::CanPinShortcutToTaskbar(), 586 base::win::CanPinShortcutToTaskbar(),
587 ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH 587 ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH
(...skipping 26 matching lines...) Expand all
614 614
615 } // namespace internals 615 } // namespace internals
616 616
617 void UpdateShortcutForTabContents(content::WebContents* web_contents) { 617 void UpdateShortcutForTabContents(content::WebContents* web_contents) {
618 // UpdateShortcutWorker will delete itself when it's done. 618 // UpdateShortcutWorker will delete itself when it's done.
619 UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents); 619 UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents);
620 worker->Run(); 620 worker->Run();
621 } 621 }
622 622
623 } // namespace web_app 623 } // namespace web_app
OLDNEW
« no previous file with comments | « chrome/browser/web_applications/web_app.h ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698