Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: components/font_service/font_service_app.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/font_service/font_service_app.cc
diff --git a/components/font_service/font_service_app.cc b/components/font_service/font_service_app.cc
index 275db7fa468dda405205b3711acc8ce1ddd5df93..130970bd1260e1db801a38ee161aaf36a04cb337 100644
--- a/components/font_service/font_service_app.cc
+++ b/components/font_service/font_service_app.cc
@@ -12,17 +12,17 @@
#include "mojo/platform_handle/platform_handle_functions.h"
static_assert(static_cast<uint32_t>(SkTypeface::kNormal) ==
- static_cast<uint32_t>(font_service::TYPEFACE_STYLE_NORMAL),
+ static_cast<uint32_t>(font_service::TypefaceStyle::NORMAL),
"Skia and font service flags must match");
static_assert(static_cast<uint32_t>(SkTypeface::kBold) ==
- static_cast<uint32_t>(font_service::TYPEFACE_STYLE_BOLD),
+ static_cast<uint32_t>(font_service::TypefaceStyle::BOLD),
"Skia and font service flags must match");
static_assert(static_cast<uint32_t>(SkTypeface::kItalic) ==
- static_cast<uint32_t>(font_service::TYPEFACE_STYLE_ITALIC),
+ static_cast<uint32_t>(font_service::TypefaceStyle::ITALIC),
"Skia and font service flags must match");
static_assert(
static_cast<uint32_t>(SkTypeface::kBoldItalic) ==
- static_cast<uint32_t>(font_service::TYPEFACE_STYLE_BOLD_ITALIC),
+ static_cast<uint32_t>(font_service::TypefaceStyle::BOLD_ITALIC),
"Skia and font service flags must match");
namespace {
@@ -86,7 +86,7 @@ void FontServiceApp::MatchFamilyName(const mojo::String& family_name,
&result_identity, &result_family, &result_style);
if (!r) {
- callback.Run(nullptr, "", TYPEFACE_STYLE_NORMAL);
+ callback.Run(nullptr, "", TypefaceStyle::NORMAL);
return;
}

Powered by Google App Engine
This is Rietveld 408576698