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: chrome/browser/ui/views/website_settings/chosen_object_view.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
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 "chrome/browser/ui/views/website_settings/chosen_object_view.h" 5 #include "chrome/browser/ui/views/website_settings/chosen_object_view.h"
6 6
7 #include "chrome/browser/ui/views/website_settings/chosen_object_view_observer.h " 7 #include "chrome/browser/ui/views/website_settings/chosen_object_view_observer.h "
8 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h " 8 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/resources/grit/ui_resources.h" 10 #include "ui/resources/grit/ui_resources.h"
11 #include "ui/views/controls/button/image_button.h" 11 #include "ui/views/controls/button/image_button.h"
12 #include "ui/views/controls/image_view.h" 12 #include "ui/views/controls/image_view.h"
13 #include "ui/views/controls/label.h" 13 #include "ui/views/controls/label.h"
14 #include "ui/views/layout/grid_layout.h" 14 #include "ui/views/layout/grid_layout.h"
15 15
16 ChosenObjectView::ChosenObjectView( 16 ChosenObjectView::ChosenObjectView(
17 scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo> info) 17 std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info)
18 : info_(std::move(info)) { 18 : info_(std::move(info)) {
19 views::GridLayout* layout = new views::GridLayout(this); 19 views::GridLayout* layout = new views::GridLayout(this);
20 SetLayoutManager(layout); 20 SetLayoutManager(layout);
21 const int column_set_id = 0; 21 const int column_set_id = 0;
22 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id); 22 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
23 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, 23 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
24 views::GridLayout::FIXED, kPermissionIconColumnWidth, 24 views::GridLayout::FIXED, kPermissionIconColumnWidth,
25 0); 25 0);
26 column_set->AddPaddingColumn(0, kPermissionIconMarginLeft); 26 column_set->AddPaddingColumn(0, kPermissionIconMarginLeft);
27 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, 27 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true); 72 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true);
73 icon_->SetImage(image.ToImageSkia()); 73 icon_->SetImage(image.ToImageSkia());
74 74
75 RemoveChildView(delete_button_); 75 RemoveChildView(delete_button_);
76 delete delete_button_; 76 delete delete_button_;
77 delete_button_ = nullptr; 77 delete_button_ = nullptr;
78 78
79 FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_, 79 FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_,
80 OnChosenObjectDeleted(*info_)); 80 OnChosenObjectDeleted(*info_));
81 } 81 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698