Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/focusable_border.h" | 11 #include "ui/views/controls/focusable_border.h" |
| 12 #include "ui/views/controls/scrollbar/native_scroll_bar.h" | 12 #include "ui/views/controls/scrollbar/native_scroll_bar.h" |
| 13 | 13 |
| 14 namespace views { | 14 namespace views { |
| 15 | 15 |
| 16 #if !defined(OS_MACOSX) | 16 #if !defined(OS_MACOSX) |
| 17 // static | 17 // static |
| 18 scoped_ptr<Background> PlatformStyle::CreateComboboxBackground() { | |
|
tapted
2016/03/22 23:04:33
nit: move below CreateCombboxBorder
Elly Fong-Jones
2016/03/23 18:07:44
Done.
| |
| 19 return make_scoped_ptr(nullptr); | |
|
sky
2016/03/22 23:54:30
nit: return nullptr;
Elly Fong-Jones
2016/03/23 18:07:44
Done.
| |
| 20 } | |
| 21 | |
| 22 // static | |
| 18 scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() { | 23 scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() { |
| 19 return make_scoped_ptr(new FocusableBorder()); | 24 return make_scoped_ptr(new FocusableBorder()); |
| 20 } | 25 } |
| 21 | 26 |
| 22 // static | 27 // static |
| 23 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder( | 28 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder( |
| 24 Button::ButtonStyle style) { | 29 Button::ButtonStyle style) { |
| 25 if (!ui::MaterialDesignController::IsModeMaterial() || | 30 if (!ui::MaterialDesignController::IsModeMaterial() || |
| 26 style != Button::STYLE_TEXTBUTTON) { | 31 style != Button::STYLE_TEXTBUTTON) { |
| 27 return make_scoped_ptr(new LabelButtonAssetBorder(style)); | 32 return make_scoped_ptr(new LabelButtonAssetBorder(style)); |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 41 | 46 |
| 42 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) | 47 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) |
| 43 // static | 48 // static |
| 44 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( | 49 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( |
| 45 LabelButton* button) { | 50 LabelButton* button) { |
| 46 return button->CreateDefaultBorder(); | 51 return button->CreateDefaultBorder(); |
| 47 } | 52 } |
| 48 #endif | 53 #endif |
| 49 | 54 |
| 50 } // namespace views | 55 } // namespace views |
| OLD | NEW |