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

Side by Side Diff: chrome/browser/extensions/app_shortcut_manager.cc

Issue 10915079: remove --enable-experimental-extension-apis from packaged app shortcut args (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: is_platform_app data member on ShortcutInfo no longer required Created 8 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/shell_integration.h » ('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/extensions/app_shortcut_manager.h" 5 #include "chrome/browser/extensions/app_shortcut_manager.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/web_applications/web_app.h" 10 #include "chrome/browser/web_applications/web_app.h"
(...skipping 20 matching lines...) Expand all
31 #endif 31 #endif
32 32
33 ShellIntegration::ShortcutInfo ShortcutInfoForExtensionAndProfile( 33 ShellIntegration::ShortcutInfo ShortcutInfoForExtensionAndProfile(
34 const Extension* extension, Profile* profile) { 34 const Extension* extension, Profile* profile) {
35 ShellIntegration::ShortcutInfo shortcut_info; 35 ShellIntegration::ShortcutInfo shortcut_info;
36 shortcut_info.extension_id = extension->id(); 36 shortcut_info.extension_id = extension->id();
37 shortcut_info.url = GURL(extension->launch_web_url()); 37 shortcut_info.url = GURL(extension->launch_web_url());
38 shortcut_info.title = UTF8ToUTF16(extension->name()); 38 shortcut_info.title = UTF8ToUTF16(extension->name());
39 shortcut_info.description = UTF8ToUTF16(extension->description()); 39 shortcut_info.description = UTF8ToUTF16(extension->description());
40 shortcut_info.extension_path = extension->path(); 40 shortcut_info.extension_path = extension->path();
41 shortcut_info.is_platform_app = extension->is_platform_app();
42 shortcut_info.create_in_applications_menu = true; 41 shortcut_info.create_in_applications_menu = true;
43 shortcut_info.create_in_quick_launch_bar = true; 42 shortcut_info.create_in_quick_launch_bar = true;
44 shortcut_info.create_on_desktop = true; 43 shortcut_info.create_on_desktop = true;
45 shortcut_info.profile_path = profile->GetPath(); 44 shortcut_info.profile_path = profile->GetPath();
46 return shortcut_info; 45 return shortcut_info;
47 } 46 }
48 47
49 } // namespace 48 } // namespace
50 49
51 AppShortcutManager::AppShortcutManager(Profile* profile) 50 AppShortcutManager::AppShortcutManager(Profile* profile)
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 } 154 }
156 155
157 void AppShortcutManager::DeleteApplicationShortcuts( 156 void AppShortcutManager::DeleteApplicationShortcuts(
158 const Extension* extension) { 157 const Extension* extension) {
159 ShellIntegration::ShortcutInfo delete_info = 158 ShellIntegration::ShortcutInfo delete_info =
160 ShortcutInfoForExtensionAndProfile(extension, profile_); 159 ShortcutInfoForExtensionAndProfile(extension, profile_);
161 web_app::DeleteAllShortcuts(delete_info); 160 web_app::DeleteAllShortcuts(delete_info);
162 } 161 }
163 162
164 } // namespace extensions 163 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/shell_integration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698