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

Side by Side Diff: chrome/browser/ui/views/website_settings/chosen_object_view.cc

Issue 1963563002: Views: Flip default value of CustomButton::request_focus_on_press_ to false. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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"
(...skipping 28 matching lines...) Expand all
39 views::GridLayout::CENTER); 39 views::GridLayout::CENTER);
40 // Create the label that displays the permission type. 40 // Create the label that displays the permission type.
41 views::Label* label = new views::Label(l10n_util::GetStringFUTF16( 41 views::Label* label = new views::Label(l10n_util::GetStringFUTF16(
42 info_->ui_info.label_string_id, 42 info_->ui_info.label_string_id,
43 WebsiteSettingsUI::ChosenObjectToUIString(*info_))); 43 WebsiteSettingsUI::ChosenObjectToUIString(*info_)));
44 layout->AddView(label, 1, 1, views::GridLayout::LEADING, 44 layout->AddView(label, 1, 1, views::GridLayout::LEADING,
45 views::GridLayout::CENTER); 45 views::GridLayout::CENTER);
46 // Create the delete button. 46 // Create the delete button.
47 delete_button_ = new views::ImageButton(this); 47 delete_button_ = new views::ImageButton(this);
48 views::Button::ConfigureDefaultFocus(delete_button_); 48 views::Button::ConfigureDefaultFocus(delete_button_);
49 delete_button_->set_request_focus_on_press(true);
49 delete_button_->SetTooltipText( 50 delete_button_->SetTooltipText(
50 l10n_util::GetStringUTF16(info_->ui_info.delete_tooltip_string_id)); 51 l10n_util::GetStringUTF16(info_->ui_info.delete_tooltip_string_id));
51 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 52 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
52 delete_button_->SetImage(views::ImageButton::STATE_NORMAL, 53 delete_button_->SetImage(views::ImageButton::STATE_NORMAL,
53 rb.GetImageSkiaNamed(IDR_CLOSE_2)); 54 rb.GetImageSkiaNamed(IDR_CLOSE_2));
54 delete_button_->SetImage(views::ImageButton::STATE_HOVERED, 55 delete_button_->SetImage(views::ImageButton::STATE_HOVERED,
55 rb.GetImageSkiaNamed(IDR_CLOSE_2_H)); 56 rb.GetImageSkiaNamed(IDR_CLOSE_2_H));
56 delete_button_->SetImage(views::ImageButton::STATE_PRESSED, 57 delete_button_->SetImage(views::ImageButton::STATE_PRESSED,
57 rb.GetImageSkiaNamed(IDR_CLOSE_2_P)); 58 rb.GetImageSkiaNamed(IDR_CLOSE_2_P));
58 layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING, 59 layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING,
(...skipping 13 matching lines...) Expand all
72 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true); 73 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true);
73 icon_->SetImage(image.ToImageSkia()); 74 icon_->SetImage(image.ToImageSkia());
74 75
75 RemoveChildView(delete_button_); 76 RemoveChildView(delete_button_);
76 delete delete_button_; 77 delete delete_button_;
77 delete_button_ = nullptr; 78 delete_button_ = nullptr;
78 79
79 FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_, 80 FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_,
80 OnChosenObjectDeleted(*info_)); 81 OnChosenObjectDeleted(*info_));
81 } 82 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698