Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 135 | 135 |
| 136 ChromeContentRendererClient::~ChromeContentRendererClient() { | 136 ChromeContentRendererClient::~ChromeContentRendererClient() { |
| 137 chrome::UninitializePPAPI(); | 137 chrome::UninitializePPAPI(); |
| 138 } | 138 } |
| 139 | 139 |
| 140 void ChromeContentRendererClient::RenderThreadStarted() { | 140 void ChromeContentRendererClient::RenderThreadStarted() { |
| 141 chrome_observer_.reset(new ChromeRenderProcessObserver()); | 141 chrome_observer_.reset(new ChromeRenderProcessObserver()); |
| 142 extension_dispatcher_.reset(new ExtensionDispatcher()); | 142 extension_dispatcher_.reset(new ExtensionDispatcher()); |
| 143 histogram_snapshots_.reset(new RendererHistogramSnapshots()); | 143 histogram_snapshots_.reset(new RendererHistogramSnapshots()); |
| 144 net_predictor_.reset(new RendererNetPredictor()); | 144 net_predictor_.reset(new RendererNetPredictor()); |
| 145 spellcheck_.reset(new SpellCheck()); | 145 spellcheck_.reset(new SpellCheck(this)); |
| 146 visited_link_slave_.reset(new VisitedLinkSlave()); | 146 visited_link_slave_.reset(new VisitedLinkSlave()); |
| 147 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); | 147 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); |
| 148 | 148 |
| 149 RenderThread* thread = RenderThread::current(); | 149 RenderThread* thread = RenderThread::current(); |
| 150 thread->AddFilter(new DevToolsAgentFilter()); | 150 thread->AddFilter(new DevToolsAgentFilter()); |
| 151 | 151 |
| 152 thread->AddObserver(chrome_observer_.get()); | 152 thread->AddObserver(chrome_observer_.get()); |
| 153 thread->AddObserver(extension_dispatcher_.get()); | 153 thread->AddObserver(extension_dispatcher_.get()); |
| 154 thread->AddObserver(histogram_snapshots_.get()); | 154 thread->AddObserver(histogram_snapshots_.get()); |
| 155 thread->AddObserver(phishing_classifier_.get()); | 155 thread->AddObserver(phishing_classifier_.get()); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 #endif | 195 #endif |
| 196 | 196 |
| 197 ContentSettingsObserver* content_settings = | 197 ContentSettingsObserver* content_settings = |
| 198 new ContentSettingsObserver(render_view); | 198 new ContentSettingsObserver(render_view); |
| 199 new DevToolsAgent(render_view); | 199 new DevToolsAgent(render_view); |
| 200 new ExtensionHelper(render_view, extension_dispatcher_.get()); | 200 new ExtensionHelper(render_view, extension_dispatcher_.get()); |
| 201 new MHTMLGenerator(render_view); | 201 new MHTMLGenerator(render_view); |
| 202 new PageLoadHistograms(render_view, histogram_snapshots_.get()); | 202 new PageLoadHistograms(render_view, histogram_snapshots_.get()); |
| 203 new PrintWebViewHelper(render_view); | 203 new PrintWebViewHelper(render_view); |
| 204 new SearchBox(render_view); | 204 new SearchBox(render_view); |
| 205 new SpellCheckProvider(render_view, spellcheck_.get()); | 205 spellcheck_provider_.reset(new SpellCheckProvider(render_view, |
| 206 spellcheck_.get())); | |
| 206 safe_browsing::MalwareDOMDetails::Create(render_view); | 207 safe_browsing::MalwareDOMDetails::Create(render_view); |
| 207 | 208 |
| 208 #if defined(OS_MACOSX) | 209 #if defined(OS_MACOSX) |
| 209 new TextInputClientObserver(render_view); | 210 new TextInputClientObserver(render_view); |
| 210 #endif // defined(OS_MACOSX) | 211 #endif // defined(OS_MACOSX) |
| 211 | 212 |
| 212 PasswordAutofillManager* password_autofill_manager = | 213 PasswordAutofillManager* password_autofill_manager = |
| 213 new PasswordAutofillManager(render_view); | 214 new PasswordAutofillManager(render_view); |
| 214 AutofillAgent* autofill_agent = new AutofillAgent(render_view, | 215 AutofillAgent* autofill_agent = new AutofillAgent(render_view, |
| 215 password_autofill_manager); | 216 password_autofill_manager); |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 573 // uninstalled. | 574 // uninstalled. |
| 574 if (old_url == new_url) { | 575 if (old_url == new_url) { |
| 575 bool is_extension_url = !!extensions->GetByURL(new_url); | 576 bool is_extension_url = !!extensions->GetByURL(new_url); |
| 576 if (is_extension_url != extension_dispatcher_->is_extension_process()) | 577 if (is_extension_url != extension_dispatcher_->is_extension_process()) |
| 577 return true; | 578 return true; |
| 578 } | 579 } |
| 579 | 580 |
| 580 return !extensions->InSameExtent(old_url, new_url); | 581 return !extensions->InSameExtent(old_url, new_url); |
| 581 } | 582 } |
| 582 | 583 |
| 584 void ChromeContentRendererClient::ResetSpellCheck() { | |
| 585 RenderThread* thread = RenderThread::current(); | |
| 586 if (spellcheck_.get()) { | |
|
jam
2011/06/21 22:59:39
nit: this file doesn't use brace brackets for one
Greg Billock
2011/06/22 15:58:35
Done.
| |
| 587 thread->RemoveObserver(spellcheck_.get()); | |
| 588 } | |
| 589 spellcheck_.reset(new SpellCheck(this)); | |
| 590 thread->AddObserver(spellcheck_.get()); | |
| 591 if (spellcheck_provider_.get()) { | |
| 592 spellcheck_provider_->SetSpellCheck(spellcheck_.get()); | |
| 593 } | |
| 594 } | |
| 595 | |
| 583 } // namespace chrome | 596 } // namespace chrome |
| OLD | NEW |