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

Side by Side Diff: ui/views/controls/button/blue_button.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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/controls/button/blue_button.h ('k') | ui/views/controls/button/checkbox.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 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> 7 #include <utility>
8 8
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/color_utils.h" 10 #include "ui/gfx/color_utils.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 gfx::Vector2d(0, 1), 0, 44 gfx::Vector2d(0, 1), 0,
45 GetNativeTheme()->GetSystemColor( 45 GetNativeTheme()->GetSystemColor(
46 ui::NativeTheme::kColorId_BlueButtonShadowColor)))); 46 ui::NativeTheme::kColorId_BlueButtonShadowColor))));
47 } 47 }
48 } 48 }
49 49
50 const char* BlueButton::GetClassName() const { 50 const char* BlueButton::GetClassName() const {
51 return BlueButton::kViewClassName; 51 return BlueButton::kViewClassName;
52 } 52 }
53 53
54 scoped_ptr<LabelButtonBorder> BlueButton::CreateDefaultBorder() const { 54 std::unique_ptr<LabelButtonBorder> BlueButton::CreateDefaultBorder() const {
55 // Insets for splitting the images. 55 // Insets for splitting the images.
56 const gfx::Insets insets(5); 56 const gfx::Insets insets(5);
57 scoped_ptr<LabelButtonAssetBorder> button_border( 57 std::unique_ptr<LabelButtonAssetBorder> button_border(
58 new LabelButtonAssetBorder(style())); 58 new LabelButtonAssetBorder(style()));
59 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 59 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
60 button_border->SetPainter(false, STATE_NORMAL, Painter::CreateImagePainter( 60 button_border->SetPainter(false, STATE_NORMAL, Painter::CreateImagePainter(
61 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_NORMAL), insets)); 61 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_NORMAL), insets));
62 button_border->SetPainter(false, STATE_HOVERED, Painter::CreateImagePainter( 62 button_border->SetPainter(false, STATE_HOVERED, Painter::CreateImagePainter(
63 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_HOVER), insets)); 63 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_HOVER), insets));
64 button_border->SetPainter(false, STATE_PRESSED, Painter::CreateImagePainter( 64 button_border->SetPainter(false, STATE_PRESSED, Painter::CreateImagePainter(
65 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_PRESSED), insets)); 65 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_PRESSED), insets));
66 button_border->SetPainter(false, STATE_DISABLED, Painter::CreateImagePainter( 66 button_border->SetPainter(false, STATE_DISABLED, Painter::CreateImagePainter(
67 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets)); 67 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));
68 button_border->SetPainter(true, STATE_NORMAL, Painter::CreateImagePainter( 68 button_border->SetPainter(true, STATE_NORMAL, Painter::CreateImagePainter(
69 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_NORMAL), insets)); 69 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_NORMAL), insets));
70 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter( 70 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter(
71 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets)); 71 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets));
72 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter( 72 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter(
73 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets)); 73 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets));
74 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter( 74 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter(
75 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets)); 75 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));
76 return std::move(button_border); 76 return std::move(button_border);
77 } 77 }
78 78
79 } // namespace views 79 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/blue_button.h ('k') | ui/views/controls/button/checkbox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698