ui/views/controls/button/blue_button.cc - Issue 1539583003: Convert Pass()→std::move() in ui/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/views/controls/button/blue_button.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/bubble/bubble_frame_view.cc ('k') | ui/views/controls/button/checkbox.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/controls/button/blue_button.h"	5 #include "ui/views/controls/button/blue_button.h"

6	6

	7 #include <utility>

	8

7 #include "ui/base/resource/resource_bundle.h"	9 #include "ui/base/resource/resource_bundle.h"

8 #include "ui/gfx/color_utils.h"	10 #include "ui/gfx/color_utils.h"

9 #include "ui/gfx/geometry/vector2d.h"	11 #include "ui/gfx/geometry/vector2d.h"

10 #include "ui/resources/grit/ui_resources.h"	12 #include "ui/resources/grit/ui_resources.h"

11 #include "ui/views/controls/button/label_button_border.h"	13 #include "ui/views/controls/button/label_button_border.h"

12 #include "ui/views/resources/grit/views_resources.h"	14 #include "ui/views/resources/grit/views_resources.h"

13	15

14 namespace views {	16 namespace views {

15	17

16 // static	18 // static

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 button_border->SetPainter(false, STATE_DISABLED, Painter::CreateImagePainter(	66 button_border->SetPainter(false, STATE_DISABLED, Painter::CreateImagePainter(

65 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));	67 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));

66 button_border->SetPainter(true, STATE_NORMAL, Painter::CreateImagePainter(	68 button_border->SetPainter(true, STATE_NORMAL, Painter::CreateImagePainter(

67 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_NORMAL), insets));	69 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_NORMAL), insets));

68 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter(	70 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter(

69 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets));	71 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets));

70 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter(	72 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter(

71 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets));	73 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets));

72 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter(	74 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter(

73 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));	75 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));

74 return button_border.Pass();	76 return std::move(button_border);

75 }	77 }

76	78

77 } // namespace views	79 } // namespace views

OLD	NEW