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

Unified Diff: chrome/browser/ui/views/website_settings/chosen_object_view.cc

Issue 2272793007: Material Page Info (Views, 1/3): Rename {ChosenObject, PermissionSelector}View classes to {...}Row. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/website_settings/chosen_object_view.cc
diff --git a/chrome/browser/ui/views/website_settings/chosen_object_view.cc b/chrome/browser/ui/views/website_settings/chosen_object_view.cc
deleted file mode 100644
index b43c5e59f39d1a8b79da3f2d75d912d44ccc28f8..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/website_settings/chosen_object_view.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/views/website_settings/chosen_object_view.h"
-
-#include "chrome/browser/ui/views/website_settings/chosen_object_view_observer.h"
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/resources/grit/ui_resources.h"
-#include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/image_view.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/layout/grid_layout.h"
-
-ChosenObjectView::ChosenObjectView(
- std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info)
- : info_(std::move(info)) {
- views::GridLayout* layout = new views::GridLayout(this);
- SetLayoutManager(layout);
- const int column_set_id = 0;
- views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
- column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
- views::GridLayout::FIXED, kPermissionIconColumnWidth,
- 0);
- column_set->AddPaddingColumn(0, kPermissionIconMarginLeft);
- column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
- views::GridLayout::USE_PREF, 0, 0);
- column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
- views::GridLayout::USE_PREF, 0, 0);
-
- layout->StartRow(1, column_set_id);
- // Create the permission icon.
- icon_ = new views::ImageView();
- const gfx::Image& image =
- WebsiteSettingsUI::GetChosenObjectIcon(*info_, false);
- icon_->SetImage(image.ToImageSkia());
- layout->AddView(icon_, 1, 1, views::GridLayout::CENTER,
- views::GridLayout::CENTER);
- // Create the label that displays the permission type.
- views::Label* label = new views::Label(l10n_util::GetStringFUTF16(
- info_->ui_info.label_string_id,
- WebsiteSettingsUI::ChosenObjectToUIString(*info_)));
- layout->AddView(label, 1, 1, views::GridLayout::LEADING,
- views::GridLayout::CENTER);
- // Create the delete button.
- delete_button_ = new views::ImageButton(this);
- delete_button_->SetFocusForPlatform();
- delete_button_->set_request_focus_on_press(true);
- delete_button_->SetTooltipText(
- l10n_util::GetStringUTF16(info_->ui_info.delete_tooltip_string_id));
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- delete_button_->SetImage(views::ImageButton::STATE_NORMAL,
- rb.GetImageSkiaNamed(IDR_CLOSE_2));
- delete_button_->SetImage(views::ImageButton::STATE_HOVERED,
- rb.GetImageSkiaNamed(IDR_CLOSE_2_H));
- delete_button_->SetImage(views::ImageButton::STATE_PRESSED,
- rb.GetImageSkiaNamed(IDR_CLOSE_2_P));
- layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING,
- views::GridLayout::CENTER);
-}
-
-void ChosenObjectView::AddObserver(ChosenObjectViewObserver* observer) {
- observer_list_.AddObserver(observer);
-}
-
-ChosenObjectView::~ChosenObjectView() {}
-
-void ChosenObjectView::ButtonPressed(views::Button* sender,
- const ui::Event& event) {
- // Change the icon to reflect the selected setting.
- const gfx::Image& image =
- WebsiteSettingsUI::GetChosenObjectIcon(*info_, true);
- icon_->SetImage(image.ToImageSkia());
-
- RemoveChildView(delete_button_);
- delete delete_button_;
- delete_button_ = nullptr;
-
- FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_,
- OnChosenObjectDeleted(*info_));
-}

Powered by Google App Engine
This is Rietveld 408576698