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

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

Issue 1671313002: MacViews: Overlay Scrollbars with Show/Hide Animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 10 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
« no previous file with comments | « ui/views/style/platform_style.h ('k') | ui/views/style/platform_style_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "build/build_config.h"
8 #include "ui/base/material_design/material_design_controller.h" 8 #include "ui/base/material_design/material_design_controller.h"
9 #include "ui/views/controls/button/label_button.h" 9 #include "ui/views/controls/button/label_button.h"
10 #include "ui/views/controls/button/label_button_border.h" 10 #include "ui/views/controls/button/label_button_border.h"
11 #include "ui/views/controls/scrollbar/native_scroll_bar.h"
11 12
12 namespace views { 13 namespace views {
13 14
14 #if !defined(OS_MACOSX) 15 #if !defined(OS_MACOSX)
15 // static 16 // static
16 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder( 17 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
17 Button::ButtonStyle style) { 18 Button::ButtonStyle style) {
18 if (!ui::MaterialDesignController::IsModeMaterial() || 19 if (!ui::MaterialDesignController::IsModeMaterial() ||
19 style != Button::STYLE_TEXTBUTTON) { 20 style != Button::STYLE_TEXTBUTTON) {
20 return make_scoped_ptr(new LabelButtonAssetBorder(style)); 21 return make_scoped_ptr(new LabelButtonAssetBorder(style));
21 } 22 }
22 23
23 scoped_ptr<LabelButtonBorder> border(new views::LabelButtonBorder()); 24 scoped_ptr<LabelButtonBorder> border(new views::LabelButtonBorder());
24 border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle( 25 border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
25 Button::STYLE_TEXTBUTTON)); 26 Button::STYLE_TEXTBUTTON));
26 return border; 27 return border;
27 } 28 }
29
30 // static
31 scoped_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
32 return make_scoped_ptr(new NativeScrollBar(is_horizontal));
33 }
34
28 #endif 35 #endif
29 36
30 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) 37 #if !defined(OS_LINUX) || defined(OS_CHROMEOS)
31 // static 38 // static
32 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( 39 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
33 LabelButton* button) { 40 LabelButton* button) {
34 return button->CreateDefaultBorder(); 41 return button->CreateDefaultBorder();
35 } 42 }
36 #endif 43 #endif
37 44
38 } // namespace views 45 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/style/platform_style.h ('k') | ui/views/style/platform_style_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698