chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm - Issue 2254273003: Remove text encoding UI

Side by Side Diff: chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm

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

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

« chrome/browser/ui/browser_command_controller.cc ('K') | « chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | chrome/browser/ui/toolbar/app_menu_model.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/cocoa/panels/panel_window_controller_cocoa.h"	5 #include "chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.h"

6	6

7 #import <Cocoa/Cocoa.h>	7 #import <Cocoa/Cocoa.h>

8	8

9 #include "base/auto_reset.h"	9 #include "base/auto_reset.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

(...skipping 13 matching lines...) Expand all Loading...
24 #import "chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h"	24 #import "chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h"

25 #import "chrome/browser/ui/cocoa/sprite_view.h"	25 #import "chrome/browser/ui/cocoa/sprite_view.h"

26 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"	26 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"

27 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"	27 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"

28 #include "chrome/browser/ui/panels/panel_bounds_animation.h"	28 #include "chrome/browser/ui/panels/panel_bounds_animation.h"

29 #include "chrome/browser/ui/panels/panel_collection.h"	29 #include "chrome/browser/ui/panels/panel_collection.h"

30 #include "chrome/browser/ui/panels/panel_constants.h"	30 #include "chrome/browser/ui/panels/panel_constants.h"

31 #include "chrome/browser/ui/panels/panel_manager.h"	31 #include "chrome/browser/ui/panels/panel_manager.h"

32 #include "chrome/browser/ui/panels/stacked_panel_collection.h"	32 #include "chrome/browser/ui/panels/stacked_panel_collection.h"

33 #include "chrome/browser/ui/tabs/tab_strip_model.h"	33 #include "chrome/browser/ui/tabs/tab_strip_model.h"

34 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"

35 #include "content/public/browser/render_widget_host_view.h"	34 #include "content/public/browser/render_widget_host_view.h"

36 #include "content/public/browser/web_contents.h"	35 #include "content/public/browser/web_contents.h"

37 #include "ui/base/resource/resource_bundle.h"	36 #include "ui/base/resource/resource_bundle.h"

38 #include "ui/gfx/image/image.h"	37 #include "ui/gfx/image/image.h"

39 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"	38 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"

40 #include "ui/resources/grit/ui_resources.h"	39 #include "ui/resources/grit/ui_resources.h"

41	40

42 using content::WebContents;	41 using content::WebContents;

43	42

44 const int kMinimumWindowSize = 1;	43 const int kMinimumWindowSize = 1;

(...skipping 901 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
946 if (![window canBecomeKeyWindow])	945 if (![window canBecomeKeyWindow])

947 continue;	946 continue;

948	947

949 [window makeKeyWindow];	948 [window makeKeyWindow];

950 }	949 }

951 return;	950 return;

952 }	951 }

953 }	952 }

954	953

955 @end	954 @end

OLD	NEW