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

Side by Side Diff: chrome/browser/web_applications/web_app_mac.mm

Issue 2416313002: Prepare chrome_main_app_mode_mac.mm for 10.9 (Closed)
Patch Set: Cleaned up Created 4 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
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 #import "chrome/browser/web_applications/web_app_mac.h" 5 #import "chrome/browser/web_applications/web_app_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 234
235 base::CommandLine command_line(base::CommandLine::NO_PROGRAM); 235 base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
236 command_line.AppendSwitchASCII( 236 command_line.AppendSwitchASCII(
237 app_mode::kLaunchedByChromeProcessId, 237 app_mode::kLaunchedByChromeProcessId,
238 base::IntToString(base::GetCurrentProcId())); 238 base::IntToString(base::GetCurrentProcId()));
239 if (launched_after_rebuild) 239 if (launched_after_rebuild)
240 command_line.AppendSwitch(app_mode::kLaunchedAfterRebuild); 240 command_line.AppendSwitch(app_mode::kLaunchedAfterRebuild);
241 // Launch without activating (NSWorkspaceLaunchWithoutActivation). 241 // Launch without activating (NSWorkspaceLaunchWithoutActivation).
242 base::mac::OpenApplicationWithPath( 242 base::mac::OpenApplicationWithPath(
243 shim_path, command_line, 243 shim_path, command_line,
244 NSWorkspaceLaunchDefault | NSWorkspaceLaunchWithoutActivation); 244 NSWorkspaceLaunchDefault | NSWorkspaceLaunchWithoutActivation, nullptr);
245 } 245 }
246 246
247 base::FilePath GetAppLoaderPath() { 247 base::FilePath GetAppLoaderPath() {
248 return base::mac::PathForFrameworkBundleResource( 248 return base::mac::PathForFrameworkBundleResource(
249 base::mac::NSToCFCast(@"app_mode_loader.app")); 249 base::mac::NSToCFCast(@"app_mode_loader.app"));
250 } 250 }
251 251
252 void UpdatePlatformShortcutsInternal( 252 void UpdatePlatformShortcutsInternal(
253 const base::FilePath& app_data_path, 253 const base::FilePath& app_data_path,
254 const base::string16& old_app_title, 254 const base::string16& old_app_title,
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 BuildShortcutInfoFromBundle(*it); 1129 BuildShortcutInfoFromBundle(*it);
1130 WebAppShortcutCreator shortcut_creator(it->DirName(), shortcut_info.get(), 1130 WebAppShortcutCreator shortcut_creator(it->DirName(), shortcut_info.get(),
1131 extensions::FileHandlersInfo()); 1131 extensions::FileHandlersInfo());
1132 shortcut_creator.DeleteShortcuts(); 1132 shortcut_creator.DeleteShortcuts();
1133 } 1133 }
1134 } 1134 }
1135 1135
1136 } // namespace internals 1136 } // namespace internals
1137 1137
1138 } // namespace web_app 1138 } // namespace web_app
OLDNEW
« chrome/app_shim/chrome_main_app_mode_mac.mm ('K') | « chrome/app_shim/chrome_main_app_mode_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698