OLD | NEW |
---|---|
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_command_controller.h" | |
13 #include "chrome/browser/ui/browser_commands.h" | |
11 #include "chrome/browser/ui/view_ids.h" | 14 #include "chrome/browser/ui/view_ids.h" |
12 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" | 15 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
13 #include "chrome/grit/generated_resources.h" | 16 #include "chrome/grit/generated_resources.h" |
14 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" |
15 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
16 #include "ui/base/resource/resource_bundle.h" | 19 #include "ui/base/resource/resource_bundle.h" |
17 | 20 |
18 StarView::StarView(CommandUpdater* command_updater) | 21 StarView::StarView(Browser* browser) |
19 : BubbleIconView(command_updater, IDC_BOOKMARK_PAGE) { | 22 : BubbleIconView(browser->command_controller()->command_updater(), |
23 IDC_BOOKMARK_PAGE) { | |
24 browser_ = browser; | |
Mike Wittman
2014/12/12 20:41:57
Nit: move to initializer list.
Deepak
2014/12/13 03:36:53
Done.
| |
20 set_id(VIEW_ID_STAR_BUTTON); | 25 set_id(VIEW_ID_STAR_BUTTON); |
21 SetToggled(false); | 26 SetToggled(false); |
22 } | 27 } |
23 | 28 |
24 StarView::~StarView() {} | 29 StarView::~StarView() {} |
25 | 30 |
26 void StarView::SetToggled(bool on) { | 31 void StarView::SetToggled(bool on) { |
27 SetTooltipText(l10n_util::GetStringUTF16( | 32 SetTooltipText(l10n_util::GetStringUTF16( |
28 on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR)); | 33 on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR)); |
29 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 34 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
(...skipping 15 matching lines...) Expand all Loading... | |
45 entry_point = BOOKMARK_ENTRY_POINT_STAR_KEY; | 50 entry_point = BOOKMARK_ENTRY_POINT_STAR_KEY; |
46 break; | 51 break; |
47 case EXECUTE_SOURCE_GESTURE: | 52 case EXECUTE_SOURCE_GESTURE: |
48 entry_point = BOOKMARK_ENTRY_POINT_STAR_GESTURE; | 53 entry_point = BOOKMARK_ENTRY_POINT_STAR_GESTURE; |
49 break; | 54 break; |
50 } | 55 } |
51 UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint", | 56 UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint", |
52 entry_point, | 57 entry_point, |
53 BOOKMARK_ENTRY_POINT_LIMIT); | 58 BOOKMARK_ENTRY_POINT_LIMIT); |
54 } | 59 } |
60 | |
61 void StarView::ExecuteCommand(ExecuteSource source) { | |
62 OnExecuting(source); | |
63 if (browser_) | |
Mike Wittman
2014/12/12 20:41:57
Nit: you're already depending on browser to be non
Peter Kasting
2014/12/12 21:49:05
Actually, it turns out I was wrong about it always
Deepak
2014/12/13 03:36:53
Done.
Deepak
2014/12/13 03:36:54
For considering Peter's advice, I need this if che
| |
64 chrome::BookmarkCurrentPageIgnoringExtensionOverrides(browser_); | |
65 } | |
OLD | NEW |