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.h" | 5 #include "content/shell/shell_browser_main.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 devtools_delegate_(NULL) { | 39 devtools_delegate_(NULL) { |
40 ShellContentBrowserClient* shell_browser_client = | 40 ShellContentBrowserClient* shell_browser_client = |
41 static_cast<ShellContentBrowserClient*>( | 41 static_cast<ShellContentBrowserClient*>( |
42 content::GetContentClient()->browser()); | 42 content::GetContentClient()->browser()); |
43 shell_browser_client->set_shell_browser_main_parts(this); | 43 shell_browser_client->set_shell_browser_main_parts(this); |
44 } | 44 } |
45 | 45 |
46 ShellBrowserMainParts::~ShellBrowserMainParts() { | 46 ShellBrowserMainParts::~ShellBrowserMainParts() { |
47 } | 47 } |
48 | 48 |
| 49 #if !defined(OS_MACOSX) |
| 50 void ShellBrowserMainParts::PreMainMessageLoopStart() { |
| 51 } |
| 52 #endif |
| 53 |
49 MessageLoop* ShellBrowserMainParts::GetMainMessageLoop() { | 54 MessageLoop* ShellBrowserMainParts::GetMainMessageLoop() { |
50 return NULL; | 55 return NULL; |
51 } | 56 } |
52 | 57 |
53 int ShellBrowserMainParts::PreCreateThreads() { | 58 int ShellBrowserMainParts::PreCreateThreads() { |
54 return 0; | 59 return 0; |
55 } | 60 } |
56 | 61 |
57 void ShellBrowserMainParts::PreMainMessageLoopRun() { | 62 void ShellBrowserMainParts::PreMainMessageLoopRun() { |
58 browser_context_.reset(new ShellBrowserContext(this)); | 63 browser_context_.reset(new ShellBrowserContext(this)); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 return false; | 96 return false; |
92 } | 97 } |
93 | 98 |
94 ui::Clipboard* ShellBrowserMainParts::GetClipboard() { | 99 ui::Clipboard* ShellBrowserMainParts::GetClipboard() { |
95 if (!clipboard_.get()) | 100 if (!clipboard_.get()) |
96 clipboard_.reset(new ui::Clipboard()); | 101 clipboard_.reset(new ui::Clipboard()); |
97 return clipboard_.get(); | 102 return clipboard_.get(); |
98 } | 103 } |
99 | 104 |
100 } // namespace | 105 } // namespace |
OLD | NEW |