| 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 "chrome/renderer/chrome_render_process_observer.h" | 5 #include "chrome/renderer/chrome_render_process_observer.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/allocator/allocator_extension.h" | 10 #include "base/allocator/allocator_extension.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 : client_(client), | 159 : client_(client), |
| 160 clear_cache_pending_(false) { | 160 clear_cache_pending_(false) { |
| 161 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 161 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 162 if (command_line.HasSwitch(switches::kEnableWatchdog)) { | 162 if (command_line.HasSwitch(switches::kEnableWatchdog)) { |
| 163 // TODO(JAR): Need to implement renderer IO msgloop watchdog. | 163 // TODO(JAR): Need to implement renderer IO msgloop watchdog. |
| 164 } | 164 } |
| 165 | 165 |
| 166 #if defined(ENABLE_AUTOFILL_DIALOG) | 166 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 167 WebRuntimeFeatures::enableRequestAutocomplete( | 167 WebRuntimeFeatures::enableRequestAutocomplete( |
| 168 command_line.HasSwitch(switches::kEnableInteractiveAutocomplete) || | 168 command_line.HasSwitch(switches::kEnableInteractiveAutocomplete) || |
| 169 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures)); | 169 command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures)); |
| 170 #endif | 170 #endif |
| 171 | 171 |
| 172 RenderThread* thread = RenderThread::Get(); | 172 RenderThread* thread = RenderThread::Get(); |
| 173 resource_delegate_.reset(new RendererResourceDelegate()); | 173 resource_delegate_.reset(new RendererResourceDelegate()); |
| 174 thread->SetResourceDispatcherDelegate(resource_delegate_.get()); | 174 thread->SetResourceDispatcherDelegate(resource_delegate_.get()); |
| 175 | 175 |
| 176 // Configure modules that need access to resources. | 176 // Configure modules that need access to resources. |
| 177 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); | 177 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |
| 178 | 178 |
| 179 #if defined(OS_WIN) | 179 #if defined(OS_WIN) |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 if (clear_cache_pending_) { | 316 if (clear_cache_pending_) { |
| 317 clear_cache_pending_ = false; | 317 clear_cache_pending_ = false; |
| 318 WebCache::clear(); | 318 WebCache::clear(); |
| 319 } | 319 } |
| 320 } | 320 } |
| 321 | 321 |
| 322 const RendererContentSettingRules* | 322 const RendererContentSettingRules* |
| 323 ChromeRenderProcessObserver::content_setting_rules() const { | 323 ChromeRenderProcessObserver::content_setting_rules() const { |
| 324 return &content_setting_rules_; | 324 return &content_setting_rules_; |
| 325 } | 325 } |
| OLD | NEW |