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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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(), |
81 parameters_(parameters), | 81 parameters_(parameters), |
82 run_message_loop_(true), | 82 run_message_loop_(true), |
83 devtools_delegate_(NULL), | 83 devtools_delegate_(NULL) |
84 plugin_service_filter_(NULL) { | 84 #if defined(ENABLE_PLUGINS) |
| 85 , |
| 86 plugin_service_filter_(NULL) |
| 87 #endif |
| 88 { |
85 } | 89 } |
86 | 90 |
87 ShellBrowserMainParts::~ShellBrowserMainParts() { | 91 ShellBrowserMainParts::~ShellBrowserMainParts() { |
88 } | 92 } |
89 | 93 |
90 #if !defined(OS_MACOSX) | 94 #if !defined(OS_MACOSX) |
91 void ShellBrowserMainParts::PreMainMessageLoopStart() { | 95 void ShellBrowserMainParts::PreMainMessageLoopStart() { |
92 #if defined(USE_AURA) && defined(USE_X11) | 96 #if defined(USE_AURA) && defined(USE_X11) |
93 ui::TouchFactory::SetTouchDeviceListFromCommandLine(); | 97 ui::TouchFactory::SetTouchDeviceListFromCommandLine(); |
94 #endif | 98 #endif |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 #if defined(USE_AURA) | 155 #if defined(USE_AURA) |
152 Shell::PlatformExit(); | 156 Shell::PlatformExit(); |
153 #endif | 157 #endif |
154 if (devtools_delegate_) | 158 if (devtools_delegate_) |
155 devtools_delegate_->Stop(); | 159 devtools_delegate_->Stop(); |
156 browser_context_.reset(); | 160 browser_context_.reset(); |
157 off_the_record_browser_context_.reset(); | 161 off_the_record_browser_context_.reset(); |
158 } | 162 } |
159 | 163 |
160 } // namespace | 164 } // namespace |
OLD | NEW |