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

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

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 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 | 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"
(...skipping 11 matching lines...) Expand all
22 SetToggled(false); 22 SetToggled(false);
23 set_accessibility_focusable(true); 23 set_accessibility_focusable(true);
24 } 24 }
25 25
26 StarView::~StarView() { 26 StarView::~StarView() {
27 } 27 }
28 28
29 void StarView::SetToggled(bool on) { 29 void StarView::SetToggled(bool on) {
30 SetTooltipText(l10n_util::GetStringUTF16( 30 SetTooltipText(l10n_util::GetStringUTF16(
31 on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR)); 31 on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR));
32 SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( 32 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
33 on ? IDR_STAR_LIT : IDR_STAR)); 33 on ? IDR_STAR_LIT : IDR_STAR));
34 } 34 }
35 35
36 void StarView::GetAccessibleState(ui::AccessibleViewState* state) { 36 void StarView::GetAccessibleState(ui::AccessibleViewState* state) {
37 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_STAR); 37 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_STAR);
38 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; 38 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
39 } 39 }
40 40
41 bool StarView::GetTooltipText(const gfx::Point& p, string16* tooltip) const { 41 bool StarView::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
42 // Don't show tooltip to distract user if BookmarkBubbleView is showing. 42 // Don't show tooltip to distract user if BookmarkBubbleView is showing.
(...skipping 15 matching lines...) Expand all
58 } 58 }
59 59
60 bool StarView::OnKeyPressed(const views::KeyEvent& event) { 60 bool StarView::OnKeyPressed(const views::KeyEvent& event) {
61 if (event.key_code() == ui::VKEY_SPACE || 61 if (event.key_code() == ui::VKEY_SPACE ||
62 event.key_code() == ui::VKEY_RETURN) { 62 event.key_code() == ui::VKEY_RETURN) {
63 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); 63 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
64 return true; 64 return true;
65 } 65 }
66 return false; 66 return false;
67 } 67 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/page_action_image_view.cc ('k') | chrome/browser/ui/views/notifications/balloon_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698