Make Clipboard::FormatType an opaque handle type.

webkit/glue/webclipboard_impl.cc

 // 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.
 
 #include "webkit/glue/webclipboard_impl.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 67 matching lines @@
 
 uint64 WebClipboardImpl::sequenceNumber(Buffer buffer) {
   ui::Clipboard::Buffer buffer_type;
   if (!ConvertBufferType(buffer, &buffer_type))
     return 0;
 
   return client_->GetSequenceNumber(buffer_type);
 }
 
 bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
-  ui::Clipboard::FormatType format_type;
   ui::Clipboard::Buffer buffer_type;
 
   if (!ConvertBufferType(buffer, &buffer_type))
     return false;
 
   switch (format) {
     case FormatPlainText:
       return client_->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
                                         buffer_type) ||
           client_->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
                                      buffer_type);
     case FormatHTML:
-      format_type = ui::Clipboard::GetHtmlFormatType();
-      break;
+      return client_->IsFormatAvailable(ui::Clipboard::GetHtmlFormatType(),
+                                        buffer_type);
     case FormatSmartPaste:
-      format_type = ui::Clipboard::GetWebKitSmartPasteFormatType();
-      break;
+      return client_->IsFormatAvailable(
+          ui::Clipboard::GetWebKitSmartPasteFormatType(), buffer_type);
     case FormatBookmark:
 #if defined(OS_WIN) || defined(OS_MACOSX)
-      format_type = ui::Clipboard::GetUrlWFormatType();
-      break;
+      return client_->IsFormatAvailable(ui::Clipboard::GetUrlWFormatType(),
+                                        buffer_type);
 #endif
     default:
       NOTREACHED();
-      return false;
   }
 
-  return client_->IsFormatAvailable(format_type, buffer_type);
+  return false;
 }
 
 WebVector<WebString> WebClipboardImpl::readAvailableTypes(
     Buffer buffer, bool* contains_filenames) {
   ui::Clipboard::Buffer buffer_type;
   std::vector<string16> types;
   if (ConvertBufferType(buffer, &buffer_type)) {
     client_->ReadAvailableTypes(buffer_type, &types, contains_filenames);
   }
   return types;
@@ skipping 140 matching lines @@
       break;
 #endif
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }
 
 }  // namespace webkit_glue