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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
158 ChromeRenderProcessObserver::ChromeRenderProcessObserver( | 158 ChromeRenderProcessObserver::ChromeRenderProcessObserver( |
159 chrome::ChromeContentRendererClient* client) | 159 chrome::ChromeContentRendererClient* client) |
160 : client_(client), | 160 : client_(client), |
161 clear_cache_pending_(false) { | 161 clear_cache_pending_(false) { |
162 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 162 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
163 if (command_line.HasSwitch(switches::kEnableWatchdog)) { | 163 if (command_line.HasSwitch(switches::kEnableWatchdog)) { |
164 // TODO(JAR): Need to implement renderer IO msgloop watchdog. | 164 // TODO(JAR): Need to implement renderer IO msgloop watchdog. |
165 } | 165 } |
166 | 166 |
167 #if defined(ENABLE_AUTOFILL_DIALOG) | 167 #if defined(ENABLE_AUTOFILL_DIALOG) |
168 #if defined(OS_MACOSX) | |
sky
2013/06/07 16:48:03
Is there some central autofill class we can add a
Albert Bodenhamer
2013/06/07 17:03:59
autofill_switches might work, but the code is only
| |
169 bool enableAutofill = command_line.HasSwitch( | |
170 autofill::switches::kEnableInteractiveAutocomplete); | |
171 #else | |
172 bool enableAutofill = !command_line.HasSwitch( | |
173 autofill::switches::kDisableInteractiveAutocomplete); | |
174 #endif | |
168 WebRuntimeFeatures::enableRequestAutocomplete( | 175 WebRuntimeFeatures::enableRequestAutocomplete( |
169 !command_line.HasSwitch( | 176 enableAutofill || |
170 autofill::switches::kDisableInteractiveAutocomplete) || | |
171 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures)); | 177 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures)); |
172 #endif | 178 #endif |
173 | 179 |
174 RenderThread* thread = RenderThread::Get(); | 180 RenderThread* thread = RenderThread::Get(); |
175 resource_delegate_.reset(new RendererResourceDelegate()); | 181 resource_delegate_.reset(new RendererResourceDelegate()); |
176 thread->SetResourceDispatcherDelegate(resource_delegate_.get()); | 182 thread->SetResourceDispatcherDelegate(resource_delegate_.get()); |
177 | 183 |
178 // Configure modules that need access to resources. | 184 // Configure modules that need access to resources. |
179 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); | 185 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |
180 | 186 |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
318 if (clear_cache_pending_) { | 324 if (clear_cache_pending_) { |
319 clear_cache_pending_ = false; | 325 clear_cache_pending_ = false; |
320 WebCache::clear(); | 326 WebCache::clear(); |
321 } | 327 } |
322 } | 328 } |
323 | 329 |
324 const RendererContentSettingRules* | 330 const RendererContentSettingRules* |
325 ChromeRenderProcessObserver::content_setting_rules() const { | 331 ChromeRenderProcessObserver::content_setting_rules() const { |
326 return &content_setting_rules_; | 332 return &content_setting_rules_; |
327 } | 333 } |
OLD | NEW |