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

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

Issue 765043002: Bookmark pop-up doesn't open if Ctrl+D is set as keyboard shortcut for added extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing nit. Created 6 years 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 | « chrome/browser/ui/views/location_bar/star_view.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/bookmarks/bookmark_stats.h" 10 #include "chrome/browser/bookmarks/bookmark_stats.h"
11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_commands.h"
11 #include "chrome/browser/ui/view_ids.h" 13 #include "chrome/browser/ui/view_ids.h"
12 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" 14 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
13 #include "chrome/grit/generated_resources.h" 15 #include "chrome/grit/generated_resources.h"
14 #include "grit/theme_resources.h" 16 #include "grit/theme_resources.h"
15 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
17 19
18 StarView::StarView(CommandUpdater* command_updater) 20 StarView::StarView(CommandUpdater* command_updater, Browser* browser)
19 : BubbleIconView(command_updater, IDC_BOOKMARK_PAGE) { 21 : BubbleIconView(command_updater, IDC_BOOKMARK_PAGE), browser_(browser) {
20 set_id(VIEW_ID_STAR_BUTTON); 22 set_id(VIEW_ID_STAR_BUTTON);
21 SetToggled(false); 23 SetToggled(false);
22 } 24 }
23 25
24 StarView::~StarView() {} 26 StarView::~StarView() {}
25 27
26 void StarView::SetToggled(bool on) { 28 void StarView::SetToggled(bool on) {
27 SetTooltipText(l10n_util::GetStringUTF16( 29 SetTooltipText(l10n_util::GetStringUTF16(
28 on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR)); 30 on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR));
29 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 31 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
(...skipping 15 matching lines...) Expand all
45 entry_point = BOOKMARK_ENTRY_POINT_STAR_KEY; 47 entry_point = BOOKMARK_ENTRY_POINT_STAR_KEY;
46 break; 48 break;
47 case EXECUTE_SOURCE_GESTURE: 49 case EXECUTE_SOURCE_GESTURE:
48 entry_point = BOOKMARK_ENTRY_POINT_STAR_GESTURE; 50 entry_point = BOOKMARK_ENTRY_POINT_STAR_GESTURE;
49 break; 51 break;
50 } 52 }
51 UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint", 53 UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint",
52 entry_point, 54 entry_point,
53 BOOKMARK_ENTRY_POINT_LIMIT); 55 BOOKMARK_ENTRY_POINT_LIMIT);
54 } 56 }
57
58 void StarView::ExecuteCommand(ExecuteSource source) {
59 if (browser_) {
60 OnExecuting(source);
61 chrome::BookmarkCurrentPageIgnoringExtensionOverrides(browser_);
62 } else {
63 BubbleIconView::ExecuteCommand(source);
64 }
65 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/star_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698