chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm - Issue 2254273003: Remove text encoding UI

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

Issue 2254273003: Remove text encoding UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased Created 4 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

« no previous file with comments | « chrome/browser/ui/browser_command_controller.cc ('k') | chrome/browser/ui/cocoa/browser_window_command_handler.mm » ('j') | no next file with comments »

OLD	NEW
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/scoped_observer.h"	14 #include "base/scoped_observer.h"

15 #include "base/strings/string16.h"	15 #include "base/strings/string16.h"

16 #include "base/strings/sys_string_conversions.h"	16 #include "base/strings/sys_string_conversions.h"

17 #include "base/threading/thread_task_runner_handle.h"	17 #include "base/threading/thread_task_runner_handle.h"

18 #include "chrome/app/chrome_command_ids.h"	18 #include "chrome/app/chrome_command_ids.h"

19 #import "chrome/browser/app_controller_mac.h"	19 #import "chrome/browser/app_controller_mac.h"

20 #include "chrome/browser/profiles/profile.h"	20 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/browser/ui/browser.h"	21 #include "chrome/browser/ui/browser.h"

22 #include "chrome/browser/ui/browser_window.h"	22 #include "chrome/browser/ui/browser_window.h"

23 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"	23 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"

24 #import "chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.h"	24 #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"	25 #import "chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.h"

26 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"	26 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"

27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"	27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"

28 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	28 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

29 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"

30 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"	29 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"

31 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"	30 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"

32 #import "chrome/browser/ui/cocoa/l10n_util.h"	31 #import "chrome/browser/ui/cocoa/l10n_util.h"

33 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"	32 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

34 #include "chrome/browser/ui/toolbar/app_menu_model.h"	33 #include "chrome/browser/ui/toolbar/app_menu_model.h"

35 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"	34 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"

36 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"	35 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"

37 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"	36 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"

38 #include "chrome/grit/generated_resources.h"	37 #include "chrome/grit/generated_resources.h"

39 #include "components/zoom/zoom_event_manager.h"	38 #include "components/zoom/zoom_event_manager.h"

(...skipping 590 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
630 // (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

631 // 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.

632 // 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,

633 // but unlikely unless we replace the Cocoa menu implementation.	632 // but unlikely unless we replace the Cocoa menu implementation.

634 NSView* containerSuperview = [overflowActionsContainerView_ superview];	633 NSView* containerSuperview = [overflowActionsContainerView_ superview];

635 if (NSMinX([containerSuperview frame]) != 0)	634 if (NSMinX([containerSuperview frame]) != 0)

636 [containerSuperview setFrameOrigin:NSZeroPoint];	635 [containerSuperview setFrameOrigin:NSZeroPoint];

637 }	636 }

638	637

639 @end // @implementation AppMenuButtonViewController	638 @end // @implementation AppMenuButtonViewController

OLD	NEW