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

Side by Side Diff: chrome/browser/ui/views/infobars/infobar_view.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/infobars/infobar_view.h" 5 #include "chrome/browser/ui/views/infobars/infobar_view.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #endif 9 #endif
10 10
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 views::Painter::CreateImageGridPainter(kNormalImageSet)); 124 views::Painter::CreateImageGridPainter(kNormalImageSet));
125 const int kHotImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_HOVER); 125 const int kHotImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_HOVER);
126 menu_button_border->set_hot_painter( 126 menu_button_border->set_hot_painter(
127 views::Painter::CreateImageGridPainter(kHotImageSet)); 127 views::Painter::CreateImageGridPainter(kHotImageSet));
128 const int kPushedImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_PRESSED); 128 const int kPushedImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_PRESSED);
129 menu_button_border->set_pushed_painter( 129 menu_button_border->set_pushed_painter(
130 views::Painter::CreateImageGridPainter(kPushedImageSet)); 130 views::Painter::CreateImageGridPainter(kPushedImageSet));
131 131
132 views::MenuButton* menu_button = new views::MenuButton( 132 views::MenuButton* menu_button = new views::MenuButton(
133 NULL, text, menu_button_listener, true); 133 NULL, text, menu_button_listener, true);
134 menu_button->set_border(menu_button_border.release()); 134 menu_button->SetBorder(menu_button_border.PassAs<views::Border>());
135 menu_button->set_animate_on_state_change(false); 135 menu_button->set_animate_on_state_change(false);
136 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 136 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
137 menu_button->set_menu_marker( 137 menu_button->set_menu_marker(
138 rb.GetImageNamed(IDR_INFOBARBUTTON_MENU_DROPARROW).ToImageSkia()); 138 rb.GetImageNamed(IDR_INFOBARBUTTON_MENU_DROPARROW).ToImageSkia());
139 menu_button->SetEnabledColor(SK_ColorBLACK); 139 menu_button->SetEnabledColor(SK_ColorBLACK);
140 menu_button->SetHoverColor(SK_ColorBLACK); 140 menu_button->SetHoverColor(SK_ColorBLACK);
141 menu_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont)); 141 menu_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
142 menu_button->SizeToPreferredSize(); 142 menu_button->SizeToPreferredSize();
143 menu_button->SetFocusable(true); 143 menu_button->SetFocusable(true);
144 return menu_button; 144 return menu_button;
(...skipping 13 matching lines...) Expand all
158 const int kHoveredImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_HOVER); 158 const int kHoveredImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_HOVER);
159 label_button_border->SetPainter( 159 label_button_border->SetPainter(
160 false, views::Button::STATE_HOVERED, 160 false, views::Button::STATE_HOVERED,
161 views::Painter::CreateImageGridPainter(kHoveredImageSet)); 161 views::Painter::CreateImageGridPainter(kHoveredImageSet));
162 const int kPressedImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_PRESSED); 162 const int kPressedImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_PRESSED);
163 label_button_border->SetPainter( 163 label_button_border->SetPainter(
164 false, views::Button::STATE_PRESSED, 164 false, views::Button::STATE_PRESSED,
165 views::Painter::CreateImageGridPainter(kPressedImageSet)); 165 views::Painter::CreateImageGridPainter(kPressedImageSet));
166 166
167 views::LabelButton* label_button = new views::LabelButton(listener, text); 167 views::LabelButton* label_button = new views::LabelButton(listener, text);
168 label_button->set_border(label_button_border.release()); 168 label_button->SetBorder(label_button_border.PassAs<views::Border>());
169 label_button->set_animate_on_state_change(false); 169 label_button->set_animate_on_state_change(false);
170 label_button->SetTextColor(views::Button::STATE_NORMAL, SK_ColorBLACK); 170 label_button->SetTextColor(views::Button::STATE_NORMAL, SK_ColorBLACK);
171 label_button->SetTextColor(views::Button::STATE_HOVERED, SK_ColorBLACK); 171 label_button->SetTextColor(views::Button::STATE_HOVERED, SK_ColorBLACK);
172 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 172 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
173 label_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont)); 173 label_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
174 #if defined(OS_WIN) 174 #if defined(OS_WIN)
175 if (needs_elevation && 175 if (needs_elevation &&
176 (base::win::GetVersion() >= base::win::VERSION_VISTA) && 176 (base::win::GetVersion() >= base::win::VERSION_VISTA) &&
177 base::win::UserAccountControlIsEnabled()) { 177 base::win::UserAccountControlIsEnabled()) {
178 SHSTOCKICONINFO icon_info = { sizeof(SHSTOCKICONINFO) }; 178 SHSTOCKICONINFO icon_info = { sizeof(SHSTOCKICONINFO) };
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) { 442 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) {
443 views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now); 443 views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now);
444 444
445 // This will trigger some screen readers to read the entire contents of this 445 // This will trigger some screen readers to read the entire contents of this
446 // infobar. 446 // infobar.
447 if (focused_before && focused_now && !Contains(focused_before) && 447 if (focused_before && focused_now && !Contains(focused_before) &&
448 Contains(focused_now)) { 448 Contains(focused_now)) {
449 NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true); 449 NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
450 } 450 }
451 } 451 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble_views.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698