Chromium Code Reviews| 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_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 157 #include "components/printing/renderer/print_web_view_helper.h" | 157 #include "components/printing/renderer/print_web_view_helper.h" |
| 158 #include "printing/print_settings.h" | 158 #include "printing/print_settings.h" |
| 159 #endif | 159 #endif |
| 160 | 160 |
| 161 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) | 161 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) |
| 162 #include "chrome/renderer/pepper/chrome_pdf_print_client.h" | 162 #include "chrome/renderer/pepper/chrome_pdf_print_client.h" |
| 163 #endif | 163 #endif |
| 164 | 164 |
| 165 #if BUILDFLAG(ENABLE_SPELLCHECK) | 165 #if BUILDFLAG(ENABLE_SPELLCHECK) |
| 166 #include "components/spellcheck/renderer/spellcheck.h" | 166 #include "components/spellcheck/renderer/spellcheck.h" |
| 167 #include "components/spellcheck/renderer/spellcheck_provider.h" | |
| 168 | |
| 169 #if BUILDFLAG(HAS_SPELLCHECK_PANEL) | |
| 167 #include "components/spellcheck/renderer/spellcheck_panel.h" | 170 #include "components/spellcheck/renderer/spellcheck_panel.h" |
| 168 #include "components/spellcheck/renderer/spellcheck_provider.h" | 171 #endif |
|
Lei Zhang
2017/04/14 00:55:38
Which #endif is which? Once you have nested #ifs,
Xiaocheng
2017/04/14 01:20:18
Done.
| |
| 169 #endif | 172 #endif |
| 170 | 173 |
| 171 #if BUILDFLAG(ENABLE_WEBRTC) | 174 #if BUILDFLAG(ENABLE_WEBRTC) |
| 172 #include "chrome/renderer/media/webrtc_logging_message_filter.h" | 175 #include "chrome/renderer/media/webrtc_logging_message_filter.h" |
| 173 #endif | 176 #endif |
| 174 | 177 |
| 175 using autofill::AutofillAgent; | 178 using autofill::AutofillAgent; |
| 176 using autofill::PasswordAutofillAgent; | 179 using autofill::PasswordAutofillAgent; |
| 177 using autofill::PasswordGenerationAgent; | 180 using autofill::PasswordGenerationAgent; |
| 178 using base::ASCIIToUTF16; | 181 using base::ASCIIToUTF16; |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 589 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); | 592 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); |
| 590 #endif | 593 #endif |
| 591 #if BUILDFLAG(ENABLE_SPELLCHECK) | 594 #if BUILDFLAG(ENABLE_SPELLCHECK) |
| 592 // This is a workaround keeping the behavior that, the Blink side spellcheck | 595 // This is a workaround keeping the behavior that, the Blink side spellcheck |
| 593 // enabled state is initialized on RenderView creation. | 596 // enabled state is initialized on RenderView creation. |
| 594 // TODO(xiaochengh): Design better way to sync between Chrome-side and | 597 // TODO(xiaochengh): Design better way to sync between Chrome-side and |
| 595 // Blink-side spellcheck enabled states. See crbug.com/710097. | 598 // Blink-side spellcheck enabled states. See crbug.com/710097. |
| 596 if (SpellCheckProvider* provider = | 599 if (SpellCheckProvider* provider = |
| 597 SpellCheckProvider::Get(render_view->GetMainRenderFrame())) | 600 SpellCheckProvider::Get(render_view->GetMainRenderFrame())) |
| 598 provider->EnableSpellcheck(spellcheck_->IsSpellcheckEnabled()); | 601 provider->EnableSpellcheck(spellcheck_->IsSpellcheckEnabled()); |
| 602 | |
| 603 #if BUILDFLAG(HAS_SPELLCHECK_PANEL) | |
| 599 new SpellCheckPanel(render_view); | 604 new SpellCheckPanel(render_view); |
| 600 #endif | 605 #endif |
| 606 #endif | |
| 601 new prerender::PrerendererClient(render_view); | 607 new prerender::PrerendererClient(render_view); |
| 602 | 608 |
| 603 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); | 609 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); |
| 604 | 610 |
| 605 new password_manager::CredentialManagerClient(render_view); | 611 new password_manager::CredentialManagerClient(render_view); |
| 606 } | 612 } |
| 607 | 613 |
| 608 | 614 |
| 609 SkBitmap* ChromeContentRendererClient::GetSadPluginBitmap() { | 615 SkBitmap* ChromeContentRendererClient::GetSadPluginBitmap() { |
| 610 return const_cast<SkBitmap*>(ResourceBundle::GetSharedInstance(). | 616 return const_cast<SkBitmap*>(ResourceBundle::GetSharedInstance(). |
| (...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1545 | 1551 |
| 1546 RecordYouTubeRewriteUMA(result); | 1552 RecordYouTubeRewriteUMA(result); |
| 1547 return corrected_url.ReplaceComponents(r); | 1553 return corrected_url.ReplaceComponents(r); |
| 1548 } | 1554 } |
| 1549 | 1555 |
| 1550 std::unique_ptr<base::TaskScheduler::InitParams> | 1556 std::unique_ptr<base::TaskScheduler::InitParams> |
| 1551 ChromeContentRendererClient::GetTaskSchedulerInitParams() { | 1557 ChromeContentRendererClient::GetTaskSchedulerInitParams() { |
| 1552 return task_scheduler_util:: | 1558 return task_scheduler_util:: |
| 1553 GetRendererTaskSchedulerInitParamsFromCommandLine(); | 1559 GetRendererTaskSchedulerInitParamsFromCommandLine(); |
| 1554 } | 1560 } |
| OLD | NEW |