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

Side by Side Diff: ui/message_center/views/message_center_button_bar.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
« no previous file with comments | « ui/app_list/views/folder_header_view.cc ('k') | ui/message_center/views/notification_button.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/message_center/views/message_center_button_bar.h" 5 #include "ui/message_center/views/message_center_button_bar.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "ui/base/models/simple_menu_model.h" 9 #include "ui/base/models/simple_menu_model.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance(); 70 ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();
71 SetImage(STATE_NORMAL, resource_bundle.GetImageSkiaNamed(normal_id)); 71 SetImage(STATE_NORMAL, resource_bundle.GetImageSkiaNamed(normal_id));
72 SetImage(STATE_HOVERED, resource_bundle.GetImageSkiaNamed(hover_id)); 72 SetImage(STATE_HOVERED, resource_bundle.GetImageSkiaNamed(hover_id));
73 SetImage(STATE_PRESSED, resource_bundle.GetImageSkiaNamed(pressed_id)); 73 SetImage(STATE_PRESSED, resource_bundle.GetImageSkiaNamed(pressed_id));
74 SetImageAlignment(views::ImageButton::ALIGN_CENTER, 74 SetImageAlignment(views::ImageButton::ALIGN_CENTER,
75 views::ImageButton::ALIGN_MIDDLE); 75 views::ImageButton::ALIGN_MIDDLE);
76 if (text_id) 76 if (text_id)
77 SetTooltipText(resource_bundle.GetLocalizedString(text_id)); 77 SetTooltipText(resource_bundle.GetLocalizedString(text_id));
78 78
79 Button::ConfigureDefaultFocus(this); 79 Button::ConfigureDefaultFocus(this);
80 set_request_focus_on_press(false);
81 80
82 SetFocusPainter(views::Painter::CreateSolidFocusPainter( 81 SetFocusPainter(views::Painter::CreateSolidFocusPainter(
83 kFocusBorderColor, 82 kFocusBorderColor,
84 gfx::Insets(1, 2, 2, 2))); 83 gfx::Insets(1, 2, 2, 2)));
85 } 84 }
86 85
87 gfx::Size NotificationCenterButton::GetPreferredSize() const { return size_; } 86 gfx::Size NotificationCenterButton::GetPreferredSize() const { return size_; }
88 87
89 // MessageCenterButtonBar ///////////////////////////////////////////////////// 88 // MessageCenterButtonBar /////////////////////////////////////////////////////
90 /////////////////////////////////////////////////////////////////////////////// 89 ///////////////////////////////////////////////////////////////////////////////
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 297 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
299 } else if (sender == close_bubble_button_) { 298 } else if (sender == close_bubble_button_) {
300 message_center_view()->tray()->HideMessageCenterBubble(); 299 message_center_view()->tray()->HideMessageCenterBubble();
301 #endif 300 #endif
302 } else { 301 } else {
303 NOTREACHED(); 302 NOTREACHED();
304 } 303 }
305 } 304 }
306 305
307 } // namespace message_center 306 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/app_list/views/folder_header_view.cc ('k') | ui/message_center/views/notification_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698