diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 8 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 2 | ||||
| -rw-r--r-- | chrome/common/cloud_print/cloud_print_class_mac.h | 18 | ||||
| -rw-r--r-- | chrome/common/cloud_print/cloud_print_class_mac.mm | 11 | ||||
| -rw-r--r-- | chrome/service/chrome_service_application_mac.mm | 14 |
5 files changed, 42 insertions, 11 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 6a4f146..1bd1c61 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -54,6 +54,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/cloud_print/cloud_print_class_mac.h" #include "chrome/common/mac/app_mode_common.h" #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" @@ -62,7 +63,6 @@ #include "content/browser/download/download_manager.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/user_metrics.h" -#include "content/common/cloud_print_class_mac.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "grit/chromium_strings.h" @@ -200,8 +200,8 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; andEventID:kAEGetURL]; [em setEventHandler:self andSelector:@selector(submitCloudPrintJob:) - forEventClass:content::kAECloudPrintClass - andEventID:content::kAECloudPrintClass]; + forEventClass:cloud_print::kAECloudPrintClass + andEventID:cloud_print::kAECloudPrintClass]; // Install and uninstall handlers for virtual drivers. [em setEventHandler:self andSelector:@selector(installCloudPrint:) @@ -1095,7 +1095,7 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; - (void)submitCloudPrintJob:(NSAppleEventDescriptor*)event { // Pull parameter list out of Apple Event. NSAppleEventDescriptor *paramList = - [event paramDescriptorForKeyword:content::kAECloudPrintClass]; + [event paramDescriptorForKeyword:cloud_print::kAECloudPrintClass]; if (paramList != nil) { // Pull required fields out of parameter list. diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 5bd5cd0..9c2c4c2 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -79,6 +79,8 @@ 'common/chrome_version_info_mac.mm', 'common/chrome_version_info_win.cc', 'common/chrome_version_info.h', + 'common/cloud_print/cloud_print_class_mac.h', + 'common/cloud_print/cloud_print_class_mac.mm', 'common/cloud_print/cloud_print_proxy_info.cc', 'common/cloud_print/cloud_print_proxy_info.h', 'common/common_api.h', diff --git a/chrome/common/cloud_print/cloud_print_class_mac.h b/chrome/common/cloud_print/cloud_print_class_mac.h new file mode 100644 index 0000000..d7df942 --- /dev/null +++ b/chrome/common/cloud_print/cloud_print_class_mac.h @@ -0,0 +1,18 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_COMMON_CLOUD_PRINT_CLOUD_PRINT_CLASS_MAC_H_ +#define CHROME_COMMON_CLOUD_PRINT_CLOUD_PRINT_CLASS_MAC_H_ +#pragma once + +#import <AppKit/AppKit.h> + +namespace cloud_print { + +// Four character constant to identify Cloud print IPC call. +extern const AEEventClass kAECloudPrintClass; + +} // namespace cloud_print + +#endif // CHROME_COMMON_CLOUD_PRINT_CLOUD_PRINT_CLASS_MAC_H_ diff --git a/chrome/common/cloud_print/cloud_print_class_mac.mm b/chrome/common/cloud_print/cloud_print_class_mac.mm new file mode 100644 index 0000000..9905e89 --- /dev/null +++ b/chrome/common/cloud_print/cloud_print_class_mac.mm @@ -0,0 +1,11 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import "chrome/common/cloud_print/cloud_print_class_mac.h" + +namespace cloud_print { + +const AEEventClass kAECloudPrintClass = 'GCPp'; + +} // namespace cloud_print diff --git a/chrome/service/chrome_service_application_mac.mm b/chrome/service/chrome_service_application_mac.mm index e7815e9..845d9f06 100644 --- a/chrome/service/chrome_service_application_mac.mm +++ b/chrome/service/chrome_service_application_mac.mm @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/mac/foundation_util.h" -#import "content/common/cloud_print_class_mac.h" +#import "chrome/common/cloud_print/cloud_print_class_mac.h" #include "chrome/common/chrome_switches.h" @interface ServiceCrApplication () @@ -20,8 +20,8 @@ NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager]; [em setEventHandler:self andSelector:@selector(submitPrint:) - forEventClass:content::kAECloudPrintClass - andEventID:content::kAECloudPrintClass]; + forEventClass:cloud_print::kAECloudPrintClass + andEventID:cloud_print::kAECloudPrintClass]; } // Event handler for Cloud Print Event. Forwards print job received to Chrome, @@ -55,17 +55,17 @@ // Actually create the Apple Event. NSAppleEventDescriptor* sendEvent = [NSAppleEventDescriptor - appleEventWithEventClass:content::kAECloudPrintClass - eventID:content::kAECloudPrintClass + appleEventWithEventClass:cloud_print::kAECloudPrintClass + eventID:cloud_print::kAECloudPrintClass targetDescriptor:nil returnID:kAutoGenerateReturnID transactionID:kAnyTransactionID]; // Pull the parameters out of AppleEvent sent to us and attach them // to our Apple Event. NSAppleEventDescriptor* parameters = - [event paramDescriptorForKeyword:content::kAECloudPrintClass]; + [event paramDescriptorForKeyword:cloud_print::kAECloudPrintClass]; [sendEvent setParamDescriptor:parameters - forKeyword:content::kAECloudPrintClass]; + forKeyword:cloud_print::kAECloudPrintClass]; LSApplicationParameters params = { 0, kLSLaunchDefaults, &ref, |