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

Side by Side Diff: ui/views/style/platform_style.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "ui/views/style/platform_style.h" 5 #include "ui/views/style/platform_style.h"
6 6
7 #include "build/build_config.h"
7 #include "ui/base/resource/material_design/material_design_controller.h" 8 #include "ui/base/resource/material_design/material_design_controller.h"
8 #include "ui/views/controls/button/label_button.h" 9 #include "ui/views/controls/button/label_button.h"
9 #include "ui/views/controls/button/label_button_border.h" 10 #include "ui/views/controls/button/label_button_border.h"
10 11
11 namespace views { 12 namespace views {
12 13
13 #if !defined(OS_MACOSX) 14 #if !defined(OS_MACOSX)
14 // static 15 // static
15 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder( 16 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
16 Button::ButtonStyle style) { 17 Button::ButtonStyle style) {
(...skipping 11 matching lines...) Expand all
28 29
29 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) 30 #if !defined(OS_LINUX) || defined(OS_CHROMEOS)
30 // static 31 // static
31 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( 32 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
32 LabelButton* button) { 33 LabelButton* button) {
33 return button->CreateDefaultBorder(); 34 return button->CreateDefaultBorder();
34 } 35 }
35 #endif 36 #endif
36 37
37 } // namespace views 38 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698