Clipboard: Update enum value names.

No logic changes.
Updates enum values' names.

(acronyms are capitalized as single words, as per [1])
[1]: https://google.github.io/styleguide/cppguide.html#General_Naming_Rules

Change-Id: I4a73939546094fc6dcacfbc0753f85cc6dc683c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1745549
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Auto-Submit: Darwin Huang <huangdarwin@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685479}

ui/base/clipboard/clipboard.cc

@@ -114,11 +114,11 @@ void Clipboard::DispatchObject(ObjectType type, const ObjectMapParams& params) {
   }
 
   switch (type) {
-    case ObjectType::CBF_TEXT:
+    case ObjectType::kText:
       WriteText(&(params[0].front()), params[0].size());
       break;
 
-    case ObjectType::CBF_HTML:
+    case ObjectType::kHtml:
       if (params.size() == 2) {
         if (params[1].empty())
           return;
@@ -129,20 +129,20 @@ void Clipboard::DispatchObject(ObjectType type, const ObjectMapParams& params) {
       }
       break;
 
-    case ObjectType::CBF_RTF:
+    case ObjectType::kRtf:
       WriteRTF(&(params[0].front()), params[0].size());
       break;
 
-    case ObjectType::CBF_BOOKMARK:
+    case ObjectType::kBookmark:
       WriteBookmark(&(params[0].front()), params[0].size(),
                     &(params[1].front()), params[1].size());
       break;
 
-    case ObjectType::CBF_WEBKIT:
+    case ObjectType::kWebkit:
       WriteWebSmartPaste();
       break;
 
-    case ObjectType::CBF_SMBITMAP: {
+    case ObjectType::kBitmap: {
       // Usually, the params are just UTF-8 strings. However, for images,
       // ScopedClipboardWriter actually sizes the buffer to sizeof(SkBitmap*),
       // aliases the contents of the vector to a SkBitmap**, and writes the
@@ -152,7 +152,7 @@ void Clipboard::DispatchObject(ObjectType type, const ObjectMapParams& params) {
       break;
     }
 
-    case ObjectType::CBF_DATA:
+    case ObjectType::kData:
       WriteData(ClipboardFormatType::Deserialize(
                     std::string(&(params[0].front()), params[0].size())),
                 &(params[1].front()), params[1].size());

ui/base/clipboard/clipboard.h

@@ -165,7 +165,7 @@ class COMPONENT_EXPORT(BASE_CLIPBOARD) Clipboard : public base::ThreadChecker {
   // designation is shared across all OSes. The system-specific designation
   // is defined by ClipboardFormatType. A single ObjectType might be represented
   // by several system-specific ClipboardFormatTypes. For example, on Linux the
-  // CBF_TEXT ObjectType maps to "text/plain", "STRING", and several other
+  // kText ObjectType maps to "text/plain", "STRING", and several other
   // formats. On windows it maps to CF_UNICODETEXT.
   //
   // The order below is the order in which data will be written to the
@@ -175,13 +175,13 @@ class COMPONENT_EXPORT(BASE_CLIPBOARD) Clipboard : public base::ThreadChecker {
   // the image, and the image's alt text. Having the types follow this order
   // maximizes the amount of data that can be extracted by various programs.
   enum class ObjectType {
-    CBF_SMBITMAP,  // Bitmap from shared memory.
-    CBF_HTML,
-    CBF_RTF,
-    CBF_BOOKMARK,
-    CBF_TEXT,
-    CBF_WEBKIT,
-    CBF_DATA,  // Arbitrary block of bytes.
+    kBitmap,  // Bitmap from shared memory.
+    kHtml,
+    kRtf,
+    kBookmark,
+    kText,
+    kWebkit,
+    kData,  // Arbitrary block of bytes.
   };
 
   // ObjectMap is a map from ObjectType to associated data.
@@ -191,17 +191,17 @@ class COMPONENT_EXPORT(BASE_CLIPBOARD) Clipboard : public base::ThreadChecker {
   //
   // Key        Arguments    Type
   // -------------------------------------
-  // CBF_SMBITMAP  bitmap       A pointer to a SkBitmap. The caller must ensure
+  // kBitmap    bitmap       A pointer to a SkBitmap. The caller must ensure
   //                         the SkBitmap remains live for the duration of
   //                         the WriteObjects call.
-  // CBF_HTML      html         char array
+  // kHtml      html         char array
   //            url*         char array
-  // CBF_RTF       data         byte array
-  // CBF_BOOKMARK  html         char array
+  // kRtf       data         byte array
+  // kBookmark  html         char array
   //            url          char array
-  // CBF_TEXT      text         char array
-  // CBF_WEBKIT    none         empty vector
-  // CBF_DATA      format       char array
+  // kText      text         char array
+  // kWebkit    none         empty vector
+  // kData      format       char array
   //            data         byte array
   using ObjectMapParam = std::vector<char>;
   using ObjectMapParams = std::vector<ObjectMapParam>;

ui/base/clipboard/clipboard_x11.cc

@@ -686,7 +686,7 @@ void ClipboardX11::WriteObjects(ClipboardType type, const ObjectMap& objects) {
   x11_details_->TakeOwnershipOfSelection(type);
 
   if (type == ClipboardType::kCopyPaste) {
-    auto text_iter = objects.find(ObjectType::CBF_TEXT);
+    auto text_iter = objects.find(ObjectType::kText);
     if (text_iter != objects.end()) {
       x11_details_->CreateNewClipboardData();
       const ObjectMapParams& params_vector = text_iter->second;

ui/base/clipboard/scoped_clipboard_writer.cc

@@ -28,7 +28,7 @@ void ScopedClipboardWriter::WriteText(const base::string16& text) {
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(
       Clipboard::ObjectMapParam(utf8_text.begin(), utf8_text.end()));
-  objects_[Clipboard::ObjectType::CBF_TEXT] = parameters;
+  objects_[Clipboard::ObjectType::kText] = parameters;
 }
 
 void ScopedClipboardWriter::WriteHTML(const base::string16& markup,
@@ -44,14 +44,14 @@ void ScopedClipboardWriter::WriteHTML(const base::string16& markup,
                                                    source_url.end()));
   }
 
-  objects_[Clipboard::ObjectType::CBF_HTML] = parameters;
+  objects_[Clipboard::ObjectType::kHtml] = parameters;
 }
 
 void ScopedClipboardWriter::WriteRTF(const std::string& rtf_data) {
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(Clipboard::ObjectMapParam(rtf_data.begin(),
                                                  rtf_data.end()));
-  objects_[Clipboard::ObjectType::CBF_RTF] = parameters;
+  objects_[Clipboard::ObjectType::kRtf] = parameters;
 }
 
 void ScopedClipboardWriter::WriteBookmark(const base::string16& bookmark_title,
@@ -65,7 +65,7 @@ void ScopedClipboardWriter::WriteBookmark(const base::string16& bookmark_title,
   parameters.push_back(Clipboard::ObjectMapParam(utf8_markup.begin(),
                                                  utf8_markup.end()));
   parameters.push_back(Clipboard::ObjectMapParam(url.begin(), url.end()));
-  objects_[Clipboard::ObjectType::CBF_BOOKMARK] = parameters;
+  objects_[Clipboard::ObjectType::kBookmark] = parameters;
 }
 
 void ScopedClipboardWriter::WriteHyperlink(const base::string16& anchor_text,
@@ -83,7 +83,7 @@ void ScopedClipboardWriter::WriteHyperlink(const base::string16& anchor_text,
 }
 
 void ScopedClipboardWriter::WriteWebSmartPaste() {
-  objects_[Clipboard::ObjectType::CBF_WEBKIT] = Clipboard::ObjectMapParams();
+  objects_[Clipboard::ObjectType::kWebkit] = Clipboard::ObjectMapParams();
 }
 
 void ScopedClipboardWriter::WriteImage(const SkBitmap& bitmap) {
@@ -100,7 +100,7 @@ void ScopedClipboardWriter::WriteImage(const SkBitmap& bitmap) {
   *reinterpret_cast<SkBitmap**>(&*packed_pointer.begin()) = bitmap_pointer;
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(packed_pointer);
-  objects_[Clipboard::ObjectType::CBF_SMBITMAP] = parameters;
+  objects_[Clipboard::ObjectType::kBitmap] = parameters;
 }
 
 void ScopedClipboardWriter::WritePickledData(
@@ -118,7 +118,7 @@ void ScopedClipboardWriter::WritePickledData(
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(format_parameter);
   parameters.push_back(data_parameter);
-  objects_[Clipboard::ObjectType::CBF_DATA] = parameters;
+  objects_[Clipboard::ObjectType::kData] = parameters;
 }
 
 void ScopedClipboardWriter::WriteData(const std::string& type,
@@ -128,7 +128,7 @@ void ScopedClipboardWriter::WriteData(const std::string& type,
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(type_parameter);
   parameters.push_back(data_parameter);
-  objects_[Clipboard::ObjectType::CBF_DATA] = parameters;
+  objects_[Clipboard::ObjectType::kData] = parameters;
 }
 
 void ScopedClipboardWriter::Reset() {