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

Side by Side Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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) 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/wrench_menu/wrench_menu_controller.h" 5 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/mac/bundle_locations.h" 8 #include "base/mac/bundle_locations.h"
9 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_util.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
11 #include "base/strings/sys_string_conversions.h" 11 #include "base/strings/sys_string_conversions.h"
12 #include "chrome/app/chrome_command_ids.h" 12 #include "chrome/app/chrome_command_ids.h"
13 #import "chrome/browser/app_controller_mac.h" 13 #import "chrome/browser/app_controller_mac.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
17 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" 17 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
20 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" 20 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
21 #import "chrome/browser/ui/cocoa/l10n_util.h" 21 #import "chrome/browser/ui/cocoa/l10n_util.h"
22 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 22 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
23 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" 23 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
24 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h" 24 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h"
25 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 25 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
26 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 26 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
27 #include "chrome/grit/generated_resources.h"
27 #include "content/public/browser/user_metrics.h" 28 #include "content/public/browser/user_metrics.h"
28 #include "grit/generated_resources.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/models/menu_model.h" 30 #include "ui/base/models/menu_model.h"
31 31
32 namespace wrench_menu_controller { 32 namespace wrench_menu_controller {
33 const CGFloat kWrenchBubblePointOffsetY = 6; 33 const CGFloat kWrenchBubblePointOffsetY = 6;
34 } 34 }
35 35
36 using base::UserMetricsAction; 36 using base::UserMetricsAction;
37 using content::HostZoomMap; 37 using content::HostZoomMap;
38 38
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 controller_ = controller; 409 controller_ = controller;
410 } 410 }
411 return self; 411 return self;
412 } 412 }
413 413
414 - (IBAction)dispatchWrenchMenuCommand:(id)sender { 414 - (IBAction)dispatchWrenchMenuCommand:(id)sender {
415 [controller_ dispatchWrenchMenuCommand:sender]; 415 [controller_ dispatchWrenchMenuCommand:sender];
416 } 416 }
417 417
418 @end // @implementation WrenchMenuButtonViewController 418 @end // @implementation WrenchMenuButtonViewController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698