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

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

Issue 1539583003: Convert Pass()→std::move() in ui/ (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
« no previous file with comments | « ui/views/mus/window_manager_connection.cc ('k') | ui/views/test/menu_runner_test_api.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 "ui/base/resource/material_design/material_design_controller.h" 7 #include "ui/base/resource/material_design/material_design_controller.h"
8 #include "ui/views/controls/button/label_button.h" 8 #include "ui/views/controls/button/label_button.h"
9 #include "ui/views/controls/button/label_button_border.h" 9 #include "ui/views/controls/button/label_button_border.h"
10 10
11 namespace views { 11 namespace views {
12 12
13 #if !defined(OS_MACOSX) 13 #if !defined(OS_MACOSX)
14 // static 14 // static
15 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder( 15 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
16 Button::ButtonStyle style) { 16 Button::ButtonStyle style) {
17 if (!ui::MaterialDesignController::IsModeMaterial() || 17 if (!ui::MaterialDesignController::IsModeMaterial() ||
18 style != Button::STYLE_TEXTBUTTON) { 18 style != Button::STYLE_TEXTBUTTON) {
19 return make_scoped_ptr(new LabelButtonAssetBorder(style)); 19 return make_scoped_ptr(new LabelButtonAssetBorder(style));
20 } 20 }
21 21
22 scoped_ptr<LabelButtonBorder> border(new views::LabelButtonBorder()); 22 scoped_ptr<LabelButtonBorder> border(new views::LabelButtonBorder());
23 border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle( 23 border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
24 Button::STYLE_TEXTBUTTON)); 24 Button::STYLE_TEXTBUTTON));
25 return border.Pass(); 25 return border;
26 } 26 }
27 #endif 27 #endif
28 28
29 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) 29 #if !defined(OS_LINUX) || defined(OS_CHROMEOS)
30 // static 30 // static
31 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( 31 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
32 LabelButton* button) { 32 LabelButton* button) {
33 return button->CreateDefaultBorder(); 33 return button->CreateDefaultBorder();
34 } 34 }
35 #endif 35 #endif
36 36
37 } // namespace views 37 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/window_manager_connection.cc ('k') | ui/views/test/menu_runner_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698