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

Side by Side Diff: chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm

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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/cocoa/app_menu/app_menu_controller.h" 5 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/mac/bundle_locations.h" 10 #include "base/mac/bundle_locations.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/metrics/user_metrics.h"
14 #include "base/scoped_observer.h" 15 #include "base/scoped_observer.h"
15 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
16 #include "base/strings/sys_string_conversions.h" 17 #include "base/strings/sys_string_conversions.h"
17 #include "base/threading/thread_task_runner_handle.h" 18 #include "base/threading/thread_task_runner_handle.h"
18 #include "chrome/app/chrome_command_ids.h" 19 #include "chrome/app/chrome_command_ids.h"
19 #import "chrome/browser/app_controller_mac.h" 20 #import "chrome/browser/app_controller_mac.h"
20 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
22 #include "chrome/browser/ui/browser_window.h" 23 #include "chrome/browser/ui/browser_window.h"
23 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" 24 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
24 #import "chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.h" 25 #import "chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.h"
25 #import "chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.h" 26 #import "chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.h"
26 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" 27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" 28 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
28 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 29 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
29 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" 30 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
30 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 31 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
31 #import "chrome/browser/ui/cocoa/l10n_util.h" 32 #import "chrome/browser/ui/cocoa/l10n_util.h"
32 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 33 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
33 #include "chrome/browser/ui/toolbar/app_menu_model.h" 34 #include "chrome/browser/ui/toolbar/app_menu_model.h"
34 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 35 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
35 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 36 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
36 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h" 37 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
37 #include "chrome/grit/generated_resources.h" 38 #include "chrome/grit/generated_resources.h"
38 #include "components/zoom/zoom_event_manager.h" 39 #include "components/zoom/zoom_event_manager.h"
39 #include "content/public/browser/user_metrics.h"
40 #include "ui/base/l10n/l10n_util.h" 40 #include "ui/base/l10n/l10n_util.h"
41 #include "ui/base/models/menu_model.h" 41 #include "ui/base/models/menu_model.h"
42 #include "ui/gfx/geometry/size.h" 42 #include "ui/gfx/geometry/size.h"
43 43
44 namespace { 44 namespace {
45 // Padding amounts on the left/right of a custom menu item (like the browser 45 // Padding amounts on the left/right of a custom menu item (like the browser
46 // actions overflow container). 46 // actions overflow container).
47 const int kLeftPadding = 16; 47 const int kLeftPadding = 16;
48 const int kRightPadding = 10; 48 const int kRightPadding = 10;
49 49
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 [[[buttonViewController_ zoomItem] viewWithTag:IDC_ZOOM_PERCENT_DISPLAY] 357 [[[buttonViewController_ zoomItem] viewWithTag:IDC_ZOOM_PERCENT_DISPLAY]
358 setTitle:title]; 358 setTitle:title];
359 [[[[buttonViewController_ zoomItem] 359 [[[[buttonViewController_ zoomItem]
360 viewWithTag:IDC_ZOOM_MINUS] image] 360 viewWithTag:IDC_ZOOM_MINUS] image]
361 setAccessibilityDescription:l10n_util::GetNSString( 361 setAccessibilityDescription:l10n_util::GetNSString(
362 IDS_TEXT_SMALLER_MAC)]; 362 IDS_TEXT_SMALLER_MAC)];
363 [[[[buttonViewController_ zoomItem] 363 [[[[buttonViewController_ zoomItem]
364 viewWithTag:IDC_ZOOM_PLUS] image] 364 viewWithTag:IDC_ZOOM_PLUS] image]
365 setAccessibilityDescription:l10n_util::GetNSString( 365 setAccessibilityDescription:l10n_util::GetNSString(
366 IDS_TEXT_BIGGER_MAC)]; 366 IDS_TEXT_BIGGER_MAC)];
367 content::RecordAction(UserMetricsAction("ShowAppMenu")); 367 base::RecordAction(UserMetricsAction("ShowAppMenu"));
368 368
369 NSImage* icon = [self appMenuModel]->browser()->window()->IsFullscreen() 369 NSImage* icon = [self appMenuModel]->browser()->window()->IsFullscreen()
370 ? [NSImage imageNamed:NSImageNameExitFullScreenTemplate] 370 ? [NSImage imageNamed:NSImageNameExitFullScreenTemplate]
371 : [NSImage imageNamed:NSImageNameEnterFullScreenTemplate]; 371 : [NSImage imageNamed:NSImageNameEnterFullScreenTemplate];
372 [[buttonViewController_ zoomFullScreen] setImage:icon]; 372 [[buttonViewController_ zoomFullScreen] setImage:icon];
373 373
374 menuOpenTime_ = base::TimeTicks::Now(); 374 menuOpenTime_ = base::TimeTicks::Now();
375 } 375 }
376 376
377 - (void)menuDidClose:(NSMenu*)menu { 377 - (void)menuDidClose:(NSMenu*)menu {
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 // (and thus, after all our ability to adjust it normally). Throw in the 629 // (and thus, after all our ability to adjust it normally). Throw in the
630 // towel, and simply don't let the frame move from where it's supposed to be. 630 // towel, and simply don't let the frame move from where it's supposed to be.
631 // TODO(devlin): Yet another Cocoa hack. It'd be good to find a workaround, 631 // TODO(devlin): Yet another Cocoa hack. It'd be good to find a workaround,
632 // but unlikely unless we replace the Cocoa menu implementation. 632 // but unlikely unless we replace the Cocoa menu implementation.
633 NSView* containerSuperview = [overflowActionsContainerView_ superview]; 633 NSView* containerSuperview = [overflowActionsContainerView_ superview];
634 if (NSMinX([containerSuperview frame]) != 0) 634 if (NSMinX([containerSuperview frame]) != 0)
635 [containerSuperview setFrameOrigin:NSZeroPoint]; 635 [containerSuperview setFrameOrigin:NSZeroPoint];
636 } 636 }
637 637
638 @end // @implementation AppMenuButtonViewController 638 @end // @implementation AppMenuButtonViewController
OLDNEW
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698