| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/shell_browser_main_parts.h" | 5 #include "content/shell/browser/shell_browser_main_parts.h" |
| 6 | 6 |
| 7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 | 139 |
| 140 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { | 140 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { |
| 141 Shell::CreateNewWindow(browser_context_.get(), | 141 Shell::CreateNewWindow(browser_context_.get(), |
| 142 GetStartupURL(), | 142 GetStartupURL(), |
| 143 NULL, | 143 NULL, |
| 144 MSG_ROUTING_NONE, | 144 MSG_ROUTING_NONE, |
| 145 gfx::Size()); | 145 gfx::Size()); |
| 146 } | 146 } |
| 147 | 147 |
| 148 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { | 148 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { |
| 149 quota::QuotaManager* quota_manager = | 149 storage::QuotaManager* quota_manager = |
| 150 BrowserContext::GetDefaultStoragePartition(browser_context()) | 150 BrowserContext::GetDefaultStoragePartition(browser_context()) |
| 151 ->GetQuotaManager(); | 151 ->GetQuotaManager(); |
| 152 BrowserThread::PostTask( | 152 BrowserThread::PostTask( |
| 153 BrowserThread::IO, | 153 BrowserThread::IO, |
| 154 FROM_HERE, | 154 FROM_HERE, |
| 155 base::Bind("a::QuotaManager::SetTemporaryGlobalOverrideQuota, | 155 base::Bind(&storage::QuotaManager::SetTemporaryGlobalOverrideQuota, |
| 156 quota_manager, | 156 quota_manager, |
| 157 kDefaultLayoutTestQuotaBytes * | 157 kDefaultLayoutTestQuotaBytes * |
| 158 quota::QuotaManager::kPerHostTemporaryPortion, | 158 storage::QuotaManager::kPerHostTemporaryPortion, |
| 159 quota::QuotaCallback())); | 159 storage::QuotaCallback())); |
| 160 #if defined(ENABLE_PLUGINS) | 160 #if defined(ENABLE_PLUGINS) |
| 161 PluginService* plugin_service = PluginService::GetInstance(); | 161 PluginService* plugin_service = PluginService::GetInstance(); |
| 162 plugin_service_filter_.reset(new ShellPluginServiceFilter); | 162 plugin_service_filter_.reset(new ShellPluginServiceFilter); |
| 163 plugin_service->SetFilter(plugin_service_filter_.get()); | 163 plugin_service->SetFilter(plugin_service_filter_.get()); |
| 164 #endif | 164 #endif |
| 165 } | 165 } |
| 166 | 166 |
| 167 if (parameters_.ui_task) { | 167 if (parameters_.ui_task) { |
| 168 parameters_.ui_task->Run(); | 168 parameters_.ui_task->Run(); |
| 169 delete parameters_.ui_task; | 169 delete parameters_.ui_task; |
| 170 run_message_loop_ = false; | 170 run_message_loop_ = false; |
| 171 } | 171 } |
| 172 } | 172 } |
| 173 | 173 |
| 174 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 174 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
| 175 return !run_message_loop_; | 175 return !run_message_loop_; |
| 176 } | 176 } |
| 177 | 177 |
| 178 void ShellBrowserMainParts::PostMainMessageLoopRun() { | 178 void ShellBrowserMainParts::PostMainMessageLoopRun() { |
| 179 if (devtools_delegate_) | 179 if (devtools_delegate_) |
| 180 devtools_delegate_->Stop(); | 180 devtools_delegate_->Stop(); |
| 181 browser_context_.reset(); | 181 browser_context_.reset(); |
| 182 off_the_record_browser_context_.reset(); | 182 off_the_record_browser_context_.reset(); |
| 183 } | 183 } |
| 184 | 184 |
| 185 } // namespace | 185 } // namespace |
| OLD | NEW |