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