summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp
diff options
context:
space:
mode:
authorteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-24 19:16:45 +0000
committerteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-24 19:16:45 +0000
commit2acf7ce7bf1917dc59769411ad2657dffc47c3a0 (patch)
treef3a65eb5dd33f146d0ba5aa2901ee2f5610109ad /ppapi/cpp
parente29d0ac91c9834d0993281ef453c3342dae26800 (diff)
downloadchromium_src-2acf7ce7bf1917dc59769411ad2657dffc47c3a0.zip
chromium_src-2acf7ce7bf1917dc59769411ad2657dffc47c3a0.tar.gz
chromium_src-2acf7ce7bf1917dc59769411ad2657dffc47c3a0.tar.bz2
Pepper: Remove verson 0.6 of PPB_Printing_Dev.
This is a deprecated dev interface that's had a replacement shipped in M23. There's a test for source compatability that will catch any problems if they exist with flash source code (which I don't have access to). Removing this interface lets us get rid of some cruft and autogenerate the thunk for PPB_Printing_Dev. Tested: Built browser_tests and chrome. R=raymes BUG= Review URL: https://chromiumcodereview.appspot.com/13852040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp')
-rw-r--r--ppapi/cpp/dev/printing_dev.cc13
1 files changed, 1 insertions, 12 deletions
diff --git a/ppapi/cpp/dev/printing_dev.cc b/ppapi/cpp/dev/printing_dev.cc
index 8e07194..60154cd 100644
--- a/ppapi/cpp/dev/printing_dev.cc
+++ b/ppapi/cpp/dev/printing_dev.cc
@@ -20,10 +20,6 @@ template <> const char* interface_name<PPB_Printing_Dev_0_7>() {
return PPB_PRINTING_DEV_INTERFACE_0_7;
}
-template <> const char* interface_name<PPB_Printing_Dev_0_6>() {
- return PPB_PRINTING_DEV_INTERFACE_0_6;
-}
-
uint32_t QuerySupportedFormats(PP_Instance instance) {
void* object =
Instance::GetPerInstanceObject(instance, kPPPPrintingInterface);
@@ -97,9 +93,7 @@ Printing_Dev::~Printing_Dev() {
// static
bool Printing_Dev::IsAvailable() {
- return has_interface<PPB_Printing_Dev_0_7>() ||
- has_interface<PPB_Printing_Dev_0_6>();
-
+ return has_interface<PPB_Printing_Dev_0_7>();
}
int32_t Printing_Dev::GetDefaultPrintSettings(
@@ -107,11 +101,6 @@ int32_t Printing_Dev::GetDefaultPrintSettings(
if (has_interface<PPB_Printing_Dev_0_7>()) {
return get_interface<PPB_Printing_Dev_0_7>()->GetDefaultPrintSettings(
pp_resource(), callback.output(), callback.pp_completion_callback());
- } else if (has_interface<PPB_Printing_Dev_0_6>()) {
- bool success = PP_ToBool(get_interface<PPB_Printing_Dev_0_6>()->
- GetDefaultPrintSettings(associated_instance_.pp_instance(),
- callback.output()));
- return callback.MayForce(success ? PP_OK : PP_ERROR_FAILED);
}
return callback.MayForce(PP_ERROR_NOINTERFACE);
}