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

Unified Diff: chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm

Issue 1508893003: Use proper namespace in skia/ext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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: chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm
diff --git a/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm b/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm
index 46b794c4c884ef2027ad5f4a3cc64c252888d6ac..50b099380175e68cd8ca74aed261438d690dff68 100644
--- a/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm
+++ b/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm
@@ -304,7 +304,7 @@ void CardUnmaskPromptViewBridge::PerformClose() {
if (!text.empty()) {
if (!permanentErrorBox_) {
permanentErrorBox_ = [CardUnmaskPromptViewCocoa createPlainBox];
- [permanentErrorBox_ setFillColor:gfx::SkColorToCalibratedNSColor(
+ [permanentErrorBox_ setFillColor:skia::SkColorToCalibratedNSColor(
autofill::kWarningColor)];
[permanentErrorBox_
setContentViewMargins:NSMakeSize(kPermanentErrorHorizontalPadding,
@@ -312,7 +312,7 @@ void CardUnmaskPromptViewBridge::PerformClose() {
permanentErrorLabel_.reset([constrained_window::CreateLabel() retain]);
[permanentErrorLabel_ setAutoresizingMask:NSViewWidthSizable];
- [permanentErrorLabel_ setTextColor:gfx::SkColorToCalibratedNSColor(
+ [permanentErrorLabel_ setTextColor:skia::SkColorToCalibratedNSColor(
kPermanentErrorTextColor)];
[permanentErrorBox_ addSubview:permanentErrorLabel_];
@@ -482,7 +482,7 @@ void CardUnmaskPromptViewBridge::PerformClose() {
base::scoped_nsobject<NSBox> box = [CardUnmaskPromptViewCocoa createPlainBox];
[box setAutoresizingMask:NSViewWidthSizable];
- [box setFillColor:gfx::SkColorToCalibratedNSColor(kShadingColor)];
+ [box setFillColor:skia::SkColorToCalibratedNSColor(kShadingColor)];
[box setContentViewMargins:NSMakeSize(chrome_style::kHorizontalPadding,
chrome_style::kClientBottomPadding)];
[storageView_ addSubview:box];
@@ -516,7 +516,7 @@ void CardUnmaskPromptViewBridge::PerformClose() {
base::scoped_nsobject<NSBox> separator =
[CardUnmaskPromptViewCocoa createPlainBox];
[separator setAutoresizingMask:NSViewWidthSizable];
- [separator setFillColor:gfx::SkColorToCalibratedNSColor(kSubtleBorderColor)];
+ [separator setFillColor:skia::SkColorToCalibratedNSColor(kSubtleBorderColor)];
[storageView_ addSubview:separator];
[box sizeToFit];
@@ -659,7 +659,7 @@ void CardUnmaskPromptViewBridge::PerformClose() {
[mainView addSubview:progressOverlayView_];
progressOverlayLabel_.reset([constrained_window::CreateLabel() retain]);
- NSColor* throbberBlueColor = gfx::SkColorToCalibratedNSColor(
+ NSColor* throbberBlueColor = skia::SkColorToCalibratedNSColor(
ui::NativeThemeMac::instance()->GetSystemColor(
ui::NativeTheme::kColorId_ThrobberSpinningColor));
[progressOverlayLabel_ setTextColor:throbberBlueColor];
@@ -713,7 +713,7 @@ void CardUnmaskPromptViewBridge::PerformClose() {
// Add error message label.
errorLabel_.reset([constrained_window::CreateLabel() retain]);
[errorLabel_
- setTextColor:gfx::SkColorToCalibratedNSColor(autofill::kWarningColor)];
+ setTextColor:skia::SkColorToCalibratedNSColor(autofill::kWarningColor)];
[mainView addSubview:errorLabel_];
// Add cancel button.

Powered by Google App Engine
This is Rietveld 408576698