chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm - Issue 585123004: Mac: Give app_shim code a nicer home

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

Issue 585123004: Mac: Give app_shim code a nicer home (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: various cleanups 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

« no previous file with comments | « chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

OLD	NEW
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/cocoa/apps/native_app_window_cocoa.h"	5 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"

6	6

7 #include "apps/app_shim/extension_app_shim_handler_mac.h"

8 #include "base/command_line.h"	7 #include "base/command_line.h"

9 #include "base/mac/foundation_util.h"	8 #include "base/mac/foundation_util.h"

10 #include "base/mac/mac_util.h"	9 #include "base/mac/mac_util.h"

11 #include "base/mac/sdk_forward_declarations.h"	10 #include "base/mac/sdk_forward_declarations.h"

12 #include "base/strings/sys_string_conversions.h"	11 #include "base/strings/sys_string_conversions.h"

	12 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"

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

14 #include "chrome/browser/ui/cocoa/browser_window_utils.h"	14 #include "chrome/browser/ui/cocoa/browser_window_utils.h"

15 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"	15 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"

16 #import "chrome/browser/ui/cocoa/custom_frame_view.h"	16 #import "chrome/browser/ui/cocoa/custom_frame_view.h"

17 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa .h"	17 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa .h"

18 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"	18 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"

19 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.h"

20 #include "content/public/browser/native_web_keyboard_event.h"	20 #include "content/public/browser/native_web_keyboard_event.h"

21 #include "content/public/browser/render_widget_host_view.h"	21 #include "content/public/browser/render_widget_host_view.h"

22 #include "content/public/browser/web_contents.h"	22 #include "content/public/browser/web_contents.h"

(...skipping 973 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
996 }	996 }

997	997

998 void NativeAppWindowCocoa::UpdateRestoredBounds() {	998 void NativeAppWindowCocoa::UpdateRestoredBounds() {

999 if (IsRestored(*this))	999 if (IsRestored(*this))

1000 restored_bounds_ = [window() frame];	1000 restored_bounds_ = [window() frame];

1001 }	1001 }

1002	1002

1003 void NativeAppWindowCocoa::HideWithoutMarkingHidden() {	1003 void NativeAppWindowCocoa::HideWithoutMarkingHidden() {

1004 [window() orderOut:window_controller_];	1004 [window() orderOut:window_controller_];

1005 }	1005 }

OLD	NEW