| Index: chrome/browser/app_controller_mac.mm
|
| diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
|
| index 8b78e2655c742bff4593fc9ae066f051f31ea1d5..abbadfdda22ed37bf1cb86e2615ce9e9fbbcf99d 100644
|
| --- a/chrome/browser/app_controller_mac.mm
|
| +++ b/chrome/browser/app_controller_mac.mm
|
| @@ -182,8 +182,6 @@ void RecordLastRunAppBundlePath() {
|
| - (void)getUrl:(NSAppleEventDescriptor*)event
|
| withReply:(NSAppleEventDescriptor*)reply;
|
| - (void)submitCloudPrintJob:(NSAppleEventDescriptor*)event;
|
| -- (void)launchPlatformApp:(NSAppleEventDescriptor*)event
|
| - withReply:(NSAppleEventDescriptor*)reply;
|
| - (void)windowLayeringDidChange:(NSNotification*)inNotification;
|
| - (void)windowChangedToProfile:(Profile*)profile;
|
| - (void)checkForAnyKeyWindows;
|
| @@ -215,11 +213,6 @@ void RecordLastRunAppBundlePath() {
|
| forEventClass:'WWW!' // A particularly ancient AppleEvent that dates
|
| andEventID:'OURL']; // back to the Spyglass days.
|
|
|
| - [em setEventHandler:self
|
| - andSelector:@selector(launchPlatformApp:withReply:)
|
| - forEventClass:app_mode::kAEChromeAppClass
|
| - andEventID:app_mode::kAEChromeAppLaunch];
|
| -
|
| // Register for various window layering changes. We use these to update
|
| // various UI elements (command-key equivalents, etc) when the frontmost
|
| // window changes.
|
| @@ -1137,38 +1130,6 @@ void RecordLastRunAppBundlePath() {
|
| [self openUrls:gurlVector];
|
| }
|
|
|
| -- (void)launchPlatformApp:(NSAppleEventDescriptor*)event
|
| - withReply:(NSAppleEventDescriptor*)reply {
|
| - NSString* appId =
|
| - [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
|
| - NSString* profileDir =
|
| - [[event paramDescriptorForKeyword:app_mode::kAEProfileDirKey]
|
| - stringValue];
|
| -
|
| - ProfileManager* profileManager = g_browser_process->profile_manager();
|
| - base::FilePath path = base::FilePath(base::SysNSStringToUTF8(profileDir));
|
| - path = profileManager->user_data_dir().Append(path);
|
| - Profile* profile = profileManager->GetProfile(path);
|
| - if (!profile) {
|
| - LOG(ERROR) << "Unable to locate a suitable profile for profile directory '"
|
| - << profileDir << "' while trying to load app with id '"
|
| - << appId << "'.";
|
| - return;
|
| - }
|
| - ExtensionServiceInterface* extensionService =
|
| - extensions::ExtensionSystem::Get(profile)->extension_service();
|
| - const extensions::Extension* extension =
|
| - extensionService->GetExtensionById(
|
| - base::SysNSStringToUTF8(appId), false);
|
| - if (!extension) {
|
| - LOG(ERROR) << "Shortcut attempted to launch nonexistent app with id '"
|
| - << base::SysNSStringToUTF8(appId) << "'.";
|
| - return;
|
| - }
|
| - chrome::OpenApplication(chrome::AppLaunchParams(
|
| - profile, extension, extension_misc::LAUNCH_NONE, NEW_WINDOW));
|
| -}
|
| -
|
| // Apple Event handler that receives print event from service
|
| // process, gets the required data and launches Print dialog.
|
| - (void)submitCloudPrintJob:(NSAppleEventDescriptor*)event {
|
|
|