| 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_application_mac.h" | 5 #include "content/shell/shell_application_mac.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "content/shell/shell.h" | 8 #include "content/shell/shell.h" |
| 9 #include "content/shell/shell_browser_context.h" | 9 #include "content/shell/shell_browser_context.h" |
| 10 #include "content/shell/shell_content_browser_client.h" | 10 #include "content/shell/shell_content_browser_client.h" |
| 11 #include "googleurl/src/gurl.h" | 11 #include "googleurl/src/gurl.h" |
| 12 | 12 |
| 13 @implementation ShellCrApplication | 13 @implementation ShellCrApplication |
| 14 | 14 |
| 15 - (BOOL)isHandlingSendEvent { | 15 - (BOOL)isHandlingSendEvent { |
| 16 return handlingSendEvent_; | 16 return handlingSendEvent_; |
| 17 } | 17 } |
| 18 | 18 |
| 19 - (void)sendEvent:(NSEvent*)event { | 19 - (void)sendEvent:(NSEvent*)event { |
| 20 base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES); | 20 base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES); |
| 21 [super sendEvent:event]; | 21 [super sendEvent:event]; |
| 22 } | 22 } |
| 23 | 23 |
| 24 - (void)setHandlingSendEvent:(BOOL)handlingSendEvent { | 24 - (void)setHandlingSendEvent:(BOOL)handlingSendEvent { |
| 25 handlingSendEvent_ = handlingSendEvent; | 25 handlingSendEvent_ = handlingSendEvent; |
| 26 } | 26 } |
| 27 | 27 |
| 28 - (IBAction)newDocument:(id)sender { | 28 - (IBAction)newDocument:(id)sender { |
| 29 content::ShellBrowserContext* browserContext = | 29 content::ShellBrowserContext* browserContext = |
| 30 static_cast<content::ShellContentBrowserClient*>( | 30 content::ShellContentBrowserClient::Get()->browser_context(); |
| 31 content::GetContentClient()->browser())->browser_context(); | |
| 32 content::Shell::CreateNewWindow(browserContext, | 31 content::Shell::CreateNewWindow(browserContext, |
| 33 GURL("about:blank"), | 32 GURL("about:blank"), |
| 34 NULL, | 33 NULL, |
| 35 MSG_ROUTING_NONE, | 34 MSG_ROUTING_NONE, |
| 36 gfx::Size()); | 35 gfx::Size()); |
| 37 } | 36 } |
| 38 | 37 |
| 39 @end | 38 @end |
| OLD | NEW |