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

Side by Side Diff: chrome/browser/ui/views/toolbar/app_menu.cc

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 years, 9 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/toolbar/app_menu.h" 5 #include "chrome/browser/ui/views/toolbar/app_menu.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <cmath> 10 #include <cmath>
11 #include <set> 11 #include <set>
12 12
13 #include "base/i18n/number_formatting.h" 13 #include "base/i18n/number_formatting.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/metrics/histogram_macros.h" 15 #include "base/metrics/histogram_macros.h"
16 #include "base/metrics/user_metrics.h"
16 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
17 #include "build/build_config.h" 18 #include "build/build_config.h"
18 #include "chrome/app/chrome_command_ids.h" 19 #include "chrome/app/chrome_command_ids.h"
19 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 20 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
20 #include "chrome/browser/bookmarks/bookmark_stats.h" 21 #include "chrome/browser/bookmarks/bookmark_stats.h"
21 #include "chrome/browser/chrome_notification_types.h" 22 #include "chrome/browser/chrome_notification_types.h"
22 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/search/search.h" 24 #include "chrome/browser/search/search.h"
24 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
25 #include "chrome/browser/ui/browser_commands.h" 26 #include "chrome/browser/ui/browser_commands.h"
26 #include "chrome/browser/ui/browser_window.h" 27 #include "chrome/browser/ui/browser_window.h"
27 #include "chrome/browser/ui/tabs/tab_strip_model.h" 28 #include "chrome/browser/ui/tabs/tab_strip_model.h"
28 #include "chrome/browser/ui/toolbar/app_menu_model.h" 29 #include "chrome/browser/ui/toolbar/app_menu_model.h"
29 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" 30 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
30 #include "chrome/browser/ui/views/toolbar/app_menu_observer.h" 31 #include "chrome/browser/ui/views/toolbar/app_menu_observer.h"
31 #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h" 32 #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h"
32 #include "chrome/grit/generated_resources.h" 33 #include "chrome/grit/generated_resources.h"
33 #include "chrome/grit/theme_resources.h" 34 #include "chrome/grit/theme_resources.h"
34 #include "components/bookmarks/browser/bookmark_model.h" 35 #include "components/bookmarks/browser/bookmark_model.h"
35 #include "components/zoom/page_zoom.h" 36 #include "components/zoom/page_zoom.h"
36 #include "components/zoom/zoom_controller.h" 37 #include "components/zoom/zoom_controller.h"
37 #include "components/zoom/zoom_event_manager.h" 38 #include "components/zoom/zoom_event_manager.h"
38 #include "content/public/browser/host_zoom_map.h" 39 #include "content/public/browser/host_zoom_map.h"
39 #include "content/public/browser/notification_observer.h" 40 #include "content/public/browser/notification_observer.h"
40 #include "content/public/browser/notification_registrar.h" 41 #include "content/public/browser/notification_registrar.h"
41 #include "content/public/browser/notification_source.h" 42 #include "content/public/browser/notification_source.h"
42 #include "content/public/browser/notification_types.h" 43 #include "content/public/browser/notification_types.h"
43 #include "content/public/browser/user_metrics.h"
44 #include "content/public/browser/web_contents.h" 44 #include "content/public/browser/web_contents.h"
45 #include "extensions/common/feature_switch.h" 45 #include "extensions/common/feature_switch.h"
46 #include "third_party/skia/include/core/SkCanvas.h" 46 #include "third_party/skia/include/core/SkCanvas.h"
47 #include "third_party/skia/include/core/SkPaint.h" 47 #include "third_party/skia/include/core/SkPaint.h"
48 #include "ui/accessibility/ax_node_data.h" 48 #include "ui/accessibility/ax_node_data.h"
49 #include "ui/base/l10n/l10n_util.h" 49 #include "ui/base/l10n/l10n_util.h"
50 #include "ui/base/layout.h" 50 #include "ui/base/layout.h"
51 #include "ui/base/resource/resource_bundle.h" 51 #include "ui/base/resource/resource_bundle.h"
52 #include "ui/gfx/canvas.h" 52 #include "ui/gfx/canvas.h"
53 #include "ui/gfx/font_list.h" 53 #include "ui/gfx/font_list.h"
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 // BrowserActionsContainer view. 819 // BrowserActionsContainer view.
820 types |= views::MenuRunner::FOR_DROP | views::MenuRunner::NESTED_DRAG; 820 types |= views::MenuRunner::FOR_DROP | views::MenuRunner::NESTED_DRAG;
821 } 821 }
822 menu_runner_.reset(new views::MenuRunner(root_, types)); 822 menu_runner_.reset(new views::MenuRunner(root_, types));
823 } 823 }
824 824
825 void AppMenu::RunMenu(views::MenuButton* host) { 825 void AppMenu::RunMenu(views::MenuButton* host) {
826 gfx::Point screen_loc; 826 gfx::Point screen_loc;
827 views::View::ConvertPointToScreen(host, &screen_loc); 827 views::View::ConvertPointToScreen(host, &screen_loc);
828 gfx::Rect bounds(screen_loc, host->size()); 828 gfx::Rect bounds(screen_loc, host->size());
829 content::RecordAction(UserMetricsAction("ShowAppMenu")); 829 base::RecordAction(UserMetricsAction("ShowAppMenu"));
830 menu_runner_->RunMenuAt(host->GetWidget(), host, bounds, 830 menu_runner_->RunMenuAt(host->GetWidget(), host, bounds,
831 views::MENU_ANCHOR_TOPRIGHT, ui::MENU_SOURCE_NONE); 831 views::MENU_ANCHOR_TOPRIGHT, ui::MENU_SOURCE_NONE);
832 } 832 }
833 833
834 void AppMenu::CloseMenu() { 834 void AppMenu::CloseMenu() {
835 if (menu_runner_.get()) 835 if (menu_runner_.get())
836 menu_runner_->Cancel(); 836 menu_runner_->Cancel();
837 } 837 }
838 838
839 bool AppMenu::IsShowing() { 839 bool AppMenu::IsShowing() {
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 0, 1236 0,
1237 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS, 1237 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
1238 BOOKMARK_LAUNCH_LOCATION_APP_MENU); 1238 BOOKMARK_LAUNCH_LOCATION_APP_MENU);
1239 } 1239 }
1240 1240
1241 int AppMenu::ModelIndexFromCommandId(int command_id) const { 1241 int AppMenu::ModelIndexFromCommandId(int command_id) const {
1242 CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id); 1242 CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
1243 DCHECK(ix != command_id_to_entry_.end()); 1243 DCHECK(ix != command_id_to_entry_.end());
1244 return ix->second.second; 1244 return ix->second.second;
1245 } 1245 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698