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

Side by Side Diff: chrome/browser/ui/views/location_bar/star_view.cc

Issue 10519008: Enlarge size of touch target for several location bar buttons without affecting visual layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge to LKGR Created 8 years, 6 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/location_bar/star_view.h" 5 #include "chrome/browser/ui/views/location_bar/star_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/command_updater.h" 9 #include "chrome/browser/command_updater.h"
10 #include "chrome/browser/ui/view_ids.h" 10 #include "chrome/browser/ui/view_ids.h"
11 #include "chrome/browser/ui/views/browser_dialogs.h" 11 #include "chrome/browser/ui/views/browser_dialogs.h"
12 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
13 #include "grit/theme_resources.h" 13 #include "grit/theme_resources.h"
14 #include "grit/theme_resources_standard.h" 14 #include "grit/theme_resources_standard.h"
15 #include "ui/base/accessibility/accessible_view_state.h" 15 #include "ui/base/accessibility/accessible_view_state.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 18
19 StarView::StarView(CommandUpdater* command_updater) 19 StarView::StarView(CommandUpdater* command_updater)
20 : command_updater_(command_updater) { 20 : command_updater_(command_updater) {
21 set_id(VIEW_ID_STAR_BUTTON); 21 set_id(VIEW_ID_STAR_BUTTON);
22 SetToggled(false); 22 SetToggled(false);
23 set_accessibility_focusable(true); 23 set_accessibility_focusable(true);
24 TouchableLocationBarView::Init(this);
24 } 25 }
25 26
26 StarView::~StarView() { 27 StarView::~StarView() {
27 } 28 }
28 29
29 void StarView::SetToggled(bool on) { 30 void StarView::SetToggled(bool on) {
30 SetTooltipText(l10n_util::GetStringUTF16( 31 SetTooltipText(l10n_util::GetStringUTF16(
31 on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR)); 32 on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR));
32 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 33 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
33 on ? IDR_STAR_LIT : IDR_STAR)); 34 on ? IDR_STAR_LIT : IDR_STAR));
34 } 35 }
35 36
37 int StarView::GetBuiltInHorizontalPadding() const {
38 return GetBuiltInHorizontalPaddingImpl();
39 }
40
36 void StarView::GetAccessibleState(ui::AccessibleViewState* state) { 41 void StarView::GetAccessibleState(ui::AccessibleViewState* state) {
37 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_STAR); 42 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_STAR);
38 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; 43 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
39 } 44 }
40 45
41 bool StarView::GetTooltipText(const gfx::Point& p, string16* tooltip) const { 46 bool StarView::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
42 // Don't show tooltip to distract user if BookmarkBubbleView is showing. 47 // Don't show tooltip to distract user if BookmarkBubbleView is showing.
43 if (browser::IsBookmarkBubbleViewShowing()) 48 if (browser::IsBookmarkBubbleViewShowing())
44 return false; 49 return false;
45 50
(...skipping 20 matching lines...) Expand all
66 } 71 }
67 72
68 bool StarView::OnKeyPressed(const views::KeyEvent& event) { 73 bool StarView::OnKeyPressed(const views::KeyEvent& event) {
69 if (event.key_code() == ui::VKEY_SPACE || 74 if (event.key_code() == ui::VKEY_SPACE ||
70 event.key_code() == ui::VKEY_RETURN) { 75 event.key_code() == ui::VKEY_RETURN) {
71 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); 76 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
72 return true; 77 return true;
73 } 78 }
74 return false; 79 return false;
75 } 80 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/star_view.h ('k') | chrome/browser/ui/views/location_bar/touchable_location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698