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

Side by Side Diff: chrome/browser/cocoa/location_bar_view_mac.mm

Issue 1560015: Replace omnibox icons with new set that are all the same size (19x19).... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 8 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #import "chrome/browser/cocoa/location_bar_view_mac.h" 5 #import "chrome/browser/cocoa/location_bar_view_mac.h"
6 6
7 #include "app/l10n_util_mac.h" 7 #include "app/l10n_util_mac.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/nsimage_cache_mac.h" 10 #include "base/nsimage_cache_mac.h"
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 // StarIconView----------------------------------------------------------------- 612 // StarIconView-----------------------------------------------------------------
613 613
614 LocationBarViewMac::StarIconView::StarIconView(CommandUpdater* command_updater) 614 LocationBarViewMac::StarIconView::StarIconView(CommandUpdater* command_updater)
615 : command_updater_(command_updater) { 615 : command_updater_(command_updater) {
616 SetVisible(true); 616 SetVisible(true);
617 SetStarred(false); 617 SetStarred(false);
618 } 618 }
619 619
620 void LocationBarViewMac::StarIconView::SetStarred(bool starred) { 620 void LocationBarViewMac::StarIconView::SetStarred(bool starred) {
621 if (starred) { 621 if (starred) {
622 SetIcon(IDR_STARRED); 622 SetIcon(IDR_OMNIBOX_STAR_LIT);
623 tooltip_.reset( 623 tooltip_.reset(
624 [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STARRED) retain]); 624 [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STARRED) retain]);
625 } else { 625 } else {
626 SetIcon(IDR_STAR); 626 SetIcon(IDR_OMNIBOX_STAR);
627 tooltip_.reset( 627 tooltip_.reset(
628 [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STAR) retain]); 628 [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STAR) retain]);
629 } 629 }
630 } 630 }
631 631
632 void LocationBarViewMac::StarIconView::OnMousePressed(NSRect bounds) { 632 void LocationBarViewMac::StarIconView::OnMousePressed(NSRect bounds) {
633 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); 633 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
634 } 634 }
635 635
636 const NSString* LocationBarViewMac::StarIconView::GetToolTip() { 636 const NSString* LocationBarViewMac::StarIconView::GetToolTip() {
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 ++result; 968 ++result;
969 } 969 }
970 return result; 970 return result;
971 } 971 }
972 972
973 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame, 973 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame,
974 size_t index) { 974 size_t index) {
975 ViewAt(index)->OnMousePressed(iconFrame); 975 ViewAt(index)->OnMousePressed(iconFrame);
976 } 976 }
977 977
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/autocomplete_text_field_unittest.mm ('k') | chrome/browser/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698