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

Unified 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: 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:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/shell_browser_main_parts_mac.mm
diff --git a/content/shell/shell_browser_main_parts_mac.mm b/content/shell/shell_browser_main_parts_mac.mm
index 1aeac325dd201b3521dc96587aacecd131d9fa08..687c161b21af360754c65bb7da20a84953185d41 100644
--- a/content/shell/shell_browser_main_parts_mac.mm
+++ b/content/shell/shell_browser_main_parts_mac.mm
@@ -8,10 +8,14 @@
#include "base/mac/bundle_locations.h"
#include "base/memory/scoped_nsobject.h"
+#include "content/shell/shell_application_mac.h"
namespace content {
void ShellBrowserMainParts::PreMainMessageLoopStart() {
+ // Force the NSApplication subclass to be used.
+ [ShellCrApplication sharedApplication];
+
scoped_nsobject<NSNib>
nib([[NSNib alloc] initWithNibNamed:@"MainMenu"
bundle:base::mac::FrameworkBundle()]);
« content/shell/shell_application_mac.h ('K') | « content/shell/shell_application_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698