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

Side by Side Diff: chrome/browser/web_applications/web_app_win.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: 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
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.h" 5 #include "chrome/browser/web_applications/web_app.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/file_util.h" 10 #include "base/file_util.h"
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 FilePath chrome_exe; 227 FilePath chrome_exe;
228 if (!PathService::Get(base::FILE_EXE, &chrome_exe)) 228 if (!PathService::Get(base::FILE_EXE, &chrome_exe))
229 return false; 229 return false;
230 230
231 // Working directory. 231 // Working directory.
232 FilePath chrome_folder = chrome_exe.DirName(); 232 FilePath chrome_folder = chrome_exe.DirName();
233 233
234 CommandLine cmd_line(CommandLine::NO_PROGRAM); 234 CommandLine cmd_line(CommandLine::NO_PROGRAM);
235 cmd_line = ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url, 235 cmd_line = ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url,
236 shortcut_info.extension_id, shortcut_info.is_platform_app, 236 shortcut_info.extension_id, shortcut_info.profile_path);
237 shortcut_info.profile_path);
238 237
239 // TODO(evan): we rely on the fact that command_line_string() is 238 // TODO(evan): we rely on the fact that command_line_string() is
240 // properly quoted for a Windows command line. The method on 239 // properly quoted for a Windows command line. The method on
241 // CommandLine should probably be renamed to better reflect that 240 // CommandLine should probably be renamed to better reflect that
242 // fact. 241 // fact.
243 string16 wide_switches(cmd_line.GetCommandLineString()); 242 string16 wide_switches(cmd_line.GetCommandLineString());
244 243
245 // Sanitize description 244 // Sanitize description
246 string16 description = shortcut_info.description; 245 string16 description = shortcut_info.description;
247 if (description.length() >= MAX_PATH) 246 if (description.length() >= MAX_PATH)
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 // they are all unpinned. 322 // they are all unpinned.
324 file_util::TaskbarUnpinShortcutLink(j->value().c_str()); 323 file_util::TaskbarUnpinShortcutLink(j->value().c_str());
325 file_util::Delete(*j, false); 324 file_util::Delete(*j, false);
326 } 325 }
327 } 326 }
328 } 327 }
329 328
330 } // namespace internals 329 } // namespace internals
331 330
332 } // namespace web_app 331 } // namespace web_app
OLDNEW
« chrome/browser/shell_integration.h ('K') | « chrome/browser/shell_integration_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698