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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 #if defined(ENABLE_AUTOFILL_DIALOG) | 268 #if defined(ENABLE_AUTOFILL_DIALOG) |
269 #if defined(OS_MACOSX) | 269 #if defined(OS_MACOSX) |
270 bool enableAutofill = command_line.HasSwitch( | 270 bool enableAutofill = command_line.HasSwitch( |
271 autofill::switches::kEnableInteractiveAutocomplete); | 271 autofill::switches::kEnableInteractiveAutocomplete); |
272 #else | 272 #else |
273 bool enableAutofill = !command_line.HasSwitch( | 273 bool enableAutofill = !command_line.HasSwitch( |
274 autofill::switches::kDisableInteractiveAutocomplete); | 274 autofill::switches::kDisableInteractiveAutocomplete); |
275 #endif | 275 #endif |
276 WebRuntimeFeatures::enableRequestAutocomplete( | 276 WebRuntimeFeatures::enableRequestAutocomplete( |
277 enableAutofill || | 277 enableAutofill || |
278 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures)); | 278 command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures)); |
279 #endif | 279 #endif |
280 | 280 |
281 RenderThread* thread = RenderThread::Get(); | 281 RenderThread* thread = RenderThread::Get(); |
282 resource_delegate_.reset(new RendererResourceDelegate()); | 282 resource_delegate_.reset(new RendererResourceDelegate()); |
283 thread->SetResourceDispatcherDelegate(resource_delegate_.get()); | 283 thread->SetResourceDispatcherDelegate(resource_delegate_.get()); |
284 | 284 |
285 // Configure modules that need access to resources. | 285 // Configure modules that need access to resources. |
286 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); | 286 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |
287 | 287 |
288 #if defined(OS_WIN) | 288 #if defined(OS_WIN) |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 if (clear_cache_pending_) { | 435 if (clear_cache_pending_) { |
436 clear_cache_pending_ = false; | 436 clear_cache_pending_ = false; |
437 WebCache::clear(); | 437 WebCache::clear(); |
438 } | 438 } |
439 } | 439 } |
440 | 440 |
441 const RendererContentSettingRules* | 441 const RendererContentSettingRules* |
442 ChromeRenderProcessObserver::content_setting_rules() const { | 442 ChromeRenderProcessObserver::content_setting_rules() const { |
443 return &content_setting_rules_; | 443 return &content_setting_rules_; |
444 } | 444 } |
OLD | NEW |