OLD | NEW |
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.h" | 5 #include "chrome/browser/web_applications/web_app.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/environment.h" | 9 #include "base/environment.h" |
8 #include "base/logging.h" | 10 #include "base/logging.h" |
9 #include "build/build_config.h" | 11 #include "build/build_config.h" |
10 #include "chrome/browser/shell_integration_linux.h" | 12 #include "chrome/browser/shell_integration_linux.h" |
11 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
12 | 14 |
13 namespace web_app { | 15 namespace web_app { |
14 | 16 |
15 void UpdateShortcutsForAllApps(Profile* profile, | 17 void UpdateShortcutsForAllApps(Profile* profile, |
16 const base::Closure& callback) { | 18 const base::Closure& callback) { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 ShortcutLocations creation_locations = | 57 ShortcutLocations creation_locations = |
56 shell_integration_linux::GetExistingShortcutLocations( | 58 shell_integration_linux::GetExistingShortcutLocations( |
57 env.get(), shortcut_info->profile_path, shortcut_info->extension_id); | 59 env.get(), shortcut_info->profile_path, shortcut_info->extension_id); |
58 | 60 |
59 // Always create a hidden shortcut in applications if a visible one is not | 61 // Always create a hidden shortcut in applications if a visible one is not |
60 // being created. This allows the operating system to identify the app, but | 62 // being created. This allows the operating system to identify the app, but |
61 // not show it in the menu. | 63 // not show it in the menu. |
62 if (creation_locations.applications_menu_location == APP_MENU_LOCATION_NONE) | 64 if (creation_locations.applications_menu_location == APP_MENU_LOCATION_NONE) |
63 creation_locations.applications_menu_location = APP_MENU_LOCATION_HIDDEN; | 65 creation_locations.applications_menu_location = APP_MENU_LOCATION_HIDDEN; |
64 | 66 |
65 CreatePlatformShortcuts(web_app_path, shortcut_info.Pass(), | 67 CreatePlatformShortcuts(web_app_path, std::move(shortcut_info), |
66 file_handlers_info, creation_locations, | 68 file_handlers_info, creation_locations, |
67 SHORTCUT_CREATION_AUTOMATED); | 69 SHORTCUT_CREATION_AUTOMATED); |
68 } | 70 } |
69 | 71 |
70 void DeleteAllShortcutsForProfile(const base::FilePath& profile_path) { | 72 void DeleteAllShortcutsForProfile(const base::FilePath& profile_path) { |
71 #if !defined(OS_CHROMEOS) | 73 #if !defined(OS_CHROMEOS) |
72 shell_integration_linux::DeleteAllDesktopShortcuts(profile_path); | 74 shell_integration_linux::DeleteAllDesktopShortcuts(profile_path); |
73 #endif | 75 #endif |
74 } | 76 } |
75 | 77 |
76 } // namespace internals | 78 } // namespace internals |
77 | 79 |
78 } // namespace web_app | 80 } // namespace web_app |
OLD | NEW |