summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing
diff options
context:
space:
mode:
authorcaseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 17:18:19 +0000
committercaseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 17:18:19 +0000
commit5533e1a0c486a3f82c9690901ab6faa9a0598320 (patch)
tree7deca7753957454054acea888debb966727c13bb /chrome/browser/printing
parentf6b224d1e92a0986adf6fb3bdaebef1c606147e1 (diff)
downloadchromium_src-5533e1a0c486a3f82c9690901ab6faa9a0598320.zip
chromium_src-5533e1a0c486a3f82c9690901ab6faa9a0598320.tar.gz
chromium_src-5533e1a0c486a3f82c9690901ab6faa9a0598320.tar.bz2
Workaround for MSVS2005 build problem with inheriting nested classes.
BUG=none TEST=successfull build under MSVS2005 TBR=scottbyer git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
-rw-r--r--chrome/browser/printing/cloud_print/cloud_print_proxy_service.h2
-rw-r--r--chrome/browser/printing/cloud_print/cloud_print_setup_handler.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
index 344c391..b9b91a0 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
@@ -18,7 +18,7 @@ class Profile;
// Layer between the browser user interface and the cloud print proxy code
// running in the service process.
class CloudPrintProxyService
- : public CloudPrintSetupHandler::Delegate,
+ : public CloudPrintSetupHandlerDelegate,
public base::RefCountedThreadSafe<CloudPrintProxyService> {
public:
explicit CloudPrintProxyService(Profile* profile);
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_handler.h b/chrome/browser/printing/cloud_print/cloud_print_setup_handler.h
index 4831cce..5225dbf 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_handler.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_handler.h
@@ -37,4 +37,7 @@ class CloudPrintSetupHandler
DISALLOW_COPY_AND_ASSIGN(CloudPrintSetupHandler);
};
+// Workaround for MSVC 2005 not handling inheritance from nested classes well.
+typedef CloudPrintSetupHandler::Delegate CloudPrintSetupHandlerDelegate;
+
#endif // CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_SETUP_HANDLER_H_