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

Side by Side Diff: ios/chrome/browser/ui/material_components/activity_indicator.mm

Issue 2888993003: [ObjC ARC] Converts ios/chrome/browser/ui/material_components:material_components to ARC. (Closed)
Patch Set: Adding strong classifier to app_bar_presenting.h Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/browser/ui/material_components/activity_indicator.h" 5 #import "ios/chrome/browser/ui/material_components/activity_indicator.h"
6 6
7 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h" 7 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
8 #import "ios/third_party/material_components_ios/src/components/Palettes/src/Mat erialPalettes.h" 8 #import "ios/third_party/material_components_ios/src/components/Palettes/src/Mat erialPalettes.h"
9 9
10 #if !defined(__has_feature) || !__has_feature(objc_arc)
11 #error "This file requires ARC support."
12 #endif
13
10 NSArray* ActivityIndicatorBrandedCycleColors() { 14 NSArray* ActivityIndicatorBrandedCycleColors() {
11 #if defined(GOOGLE_CHROME_BUILD) 15 #if defined(GOOGLE_CHROME_BUILD)
12 return @[ 16 return @[
13 [[MDCPalette cr_bluePalette] tint500], [[MDCPalette cr_redPalette] tint500], 17 [[MDCPalette cr_bluePalette] tint500], [[MDCPalette cr_redPalette] tint500],
14 [[MDCPalette cr_yellowPalette] tint500], 18 [[MDCPalette cr_yellowPalette] tint500],
15 [[MDCPalette cr_greenPalette] tint500] 19 [[MDCPalette cr_greenPalette] tint500]
16 ]; 20 ];
17 #else 21 #else
18 return @[ 22 return @[
19 [MDCPalette bluePalette].tint800, 23 [MDCPalette bluePalette].tint800,
20 [MDCPalette bluePalette].tint500, 24 [MDCPalette bluePalette].tint500,
21 [MDCPalette bluePalette].tint200, 25 [MDCPalette bluePalette].tint200,
22 ]; 26 ];
23 #endif 27 #endif
24 } 28 }
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/material_components/BUILD.gn ('k') | ios/chrome/browser/ui/material_components/app_bar_presenting.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698