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 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 IDR_DIR_HEADER_HTML); | 70 IDR_DIR_HEADER_HTML); |
71 return html_data; | 71 return html_data; |
72 } | 72 } |
73 return base::StringPiece(); | 73 return base::StringPiece(); |
74 } | 74 } |
75 | 75 |
76 } // namespace | 76 } // namespace |
77 | 77 |
78 ShellBrowserMainParts::ShellBrowserMainParts( | 78 ShellBrowserMainParts::ShellBrowserMainParts( |
79 const MainFunctionParams& parameters) | 79 const MainFunctionParams& parameters) |
80 : BrowserMainParts(), | 80 : BrowserMainParts(), parameters_(parameters), run_message_loop_(true) {} |
81 parameters_(parameters), | |
82 run_message_loop_(true), | |
83 devtools_delegate_(NULL) | |
84 #if defined(ENABLE_PLUGINS) | |
85 , | |
86 plugin_service_filter_(NULL) | |
87 #endif | |
88 { | |
89 } | |
90 | 81 |
91 ShellBrowserMainParts::~ShellBrowserMainParts() { | 82 ShellBrowserMainParts::~ShellBrowserMainParts() { |
92 } | 83 } |
93 | 84 |
94 #if !defined(OS_MACOSX) | 85 #if !defined(OS_MACOSX) |
95 void ShellBrowserMainParts::PreMainMessageLoopStart() { | 86 void ShellBrowserMainParts::PreMainMessageLoopStart() { |
96 #if defined(USE_AURA) && defined(USE_X11) | 87 #if defined(USE_AURA) && defined(USE_X11) |
97 ui::TouchFactory::SetTouchDeviceListFromCommandLine(); | 88 ui::TouchFactory::SetTouchDeviceListFromCommandLine(); |
98 #endif | 89 #endif |
99 } | 90 } |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 #if defined(USE_AURA) | 146 #if defined(USE_AURA) |
156 Shell::PlatformExit(); | 147 Shell::PlatformExit(); |
157 #endif | 148 #endif |
158 if (devtools_delegate_) | 149 if (devtools_delegate_) |
159 devtools_delegate_->Stop(); | 150 devtools_delegate_->Stop(); |
160 browser_context_.reset(); | 151 browser_context_.reset(); |
161 off_the_record_browser_context_.reset(); | 152 off_the_record_browser_context_.reset(); |
162 } | 153 } |
163 | 154 |
164 } // namespace | 155 } // namespace |
OLD | NEW |