content/shell/shell_browser_main_parts_mac.mm - Issue 9834080: Mac content shell: Implement CrApplication.

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: content/shell/shell_browser_main_parts_mac.mm

Issue 9834080: Mac content shell: Implement CrApplication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: colons Created 8 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:

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 "content/shell/shell_browser_main_parts.h"	5 #include "content/shell/shell_browser_main_parts.h"

6	6

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

8	8

9 #include "base/mac/bundle_locations.h"	9 #include "base/mac/bundle_locations.h"

10 #include "base/memory/scoped_nsobject.h"	10 #include "base/memory/scoped_nsobject.h"

	11 #include "content/shell/shell_application_mac.h"

11	12

12 namespace content {	13 namespace content {

13	14

14 void ShellBrowserMainParts::PreMainMessageLoopStart() {	15 void ShellBrowserMainParts::PreMainMessageLoopStart() {

	16 // Force the NSApplication subclass to be used.

	17 [ShellCrApplication sharedApplication];

	18

15 scoped_nsobject<NSNib>	19 scoped_nsobject<NSNib>

16 nib([[NSNib alloc] initWithNibNamed:@"MainMenu"	20 nib([[NSNib alloc] initWithNibNamed:@"MainMenu"

17 bundle:base::mac::FrameworkBundle()]);	21 bundle:base::mac::FrameworkBundle()]);

18 [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];	22 [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];

19 }	23 }

20	24

21 } // namespace content	25 } // namespace content

OLD	NEW