| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 thread->AddObserver(spellcheck_.get()); | 319 thread->AddObserver(spellcheck_.get()); |
| 320 } | 320 } |
| 321 #endif | 321 #endif |
| 322 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave()); | 322 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave()); |
| 323 #if defined(FULL_SAFE_BROWSING) | 323 #if defined(FULL_SAFE_BROWSING) |
| 324 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); | 324 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); |
| 325 #endif | 325 #endif |
| 326 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); | 326 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); |
| 327 #if defined(ENABLE_WEBRTC) | 327 #if defined(ENABLE_WEBRTC) |
| 328 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter( | 328 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter( |
| 329 content::RenderThread::Get()->GetIOMessageLoopProxy()); | 329 RenderThread::Get()->GetIOMessageLoopProxy()); |
| 330 #endif | 330 #endif |
| 331 search_bouncer_.reset(new SearchBouncer()); | 331 search_bouncer_.reset(new SearchBouncer()); |
| 332 | 332 |
| 333 thread->AddObserver(chrome_observer_.get()); | 333 thread->AddObserver(chrome_observer_.get()); |
| 334 thread->AddObserver(web_cache_observer_.get()); | 334 thread->AddObserver(web_cache_observer_.get()); |
| 335 #if defined(ENABLE_EXTENSIONS) | 335 #if defined(ENABLE_EXTENSIONS) |
| 336 thread->AddObserver(extension_dispatcher_.get()); | 336 thread->AddObserver(extension_dispatcher_.get()); |
| 337 #endif | 337 #endif |
| 338 #if defined(FULL_SAFE_BROWSING) | 338 #if defined(FULL_SAFE_BROWSING) |
| 339 thread->AddObserver(phishing_classifier_.get()); | 339 thread->AddObserver(phishing_classifier_.get()); |
| 340 #endif | 340 #endif |
| 341 thread->AddObserver(visited_link_slave_.get()); | 341 thread->AddObserver(visited_link_slave_.get()); |
| 342 thread->AddObserver(prerender_dispatcher_.get()); | 342 thread->AddObserver(prerender_dispatcher_.get()); |
| 343 thread->AddObserver(search_bouncer_.get()); | 343 thread->AddObserver(search_bouncer_.get()); |
| 344 | 344 |
| 345 #if defined(ENABLE_WEBRTC) | 345 #if defined(ENABLE_WEBRTC) |
| 346 thread->AddFilter(webrtc_logging_message_filter_.get()); | 346 thread->AddFilter(webrtc_logging_message_filter_.get()); |
| 347 #endif | 347 #endif |
| 348 #if defined(ENABLE_EXTENSIONS) | 348 #if defined(ENABLE_EXTENSIONS) |
| 349 thread->AddFilter(new CastIPCDispatcher( | 349 thread->AddFilter(new CastIPCDispatcher( |
| 350 content::RenderThread::Get()->GetIOMessageLoopProxy())); | 350 RenderThread::Get()->GetIOMessageLoopProxy())); |
| 351 #endif | 351 #endif |
| 352 | 352 |
| 353 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); | 353 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); |
| 354 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); | 354 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); |
| 355 | 355 |
| 356 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 356 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 357 if (command_line->HasSwitch(switches::kEnableBenchmarking)) | 357 if (command_line->HasSwitch(switches::kEnableBenchmarking)) |
| 358 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); | 358 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); |
| 359 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) | 359 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) |
| 360 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); | 360 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); |
| (...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1135 // TODO(erikkay): Should we use a different template for different | 1135 // TODO(erikkay): Should we use a different template for different |
| 1136 // error messages? | 1136 // error messages? |
| 1137 int resource_id = IDR_ERROR_APP_HTML; | 1137 int resource_id = IDR_ERROR_APP_HTML; |
| 1138 const base::StringPiece template_html( | 1138 const base::StringPiece template_html( |
| 1139 ResourceBundle::GetSharedInstance().GetRawDataResource( | 1139 ResourceBundle::GetSharedInstance().GetRawDataResource( |
| 1140 resource_id)); | 1140 resource_id)); |
| 1141 if (template_html.empty()) { | 1141 if (template_html.empty()) { |
| 1142 NOTREACHED() << "unable to load template. ID: " << resource_id; | 1142 NOTREACHED() << "unable to load template. ID: " << resource_id; |
| 1143 } else { | 1143 } else { |
| 1144 base::DictionaryValue error_strings; | 1144 base::DictionaryValue error_strings; |
| 1145 LocalizedError::GetAppErrorStrings(failed_url, extension, | 1145 const std::string locale = RenderThread::Get()->GetLocale(); |
| 1146 LocalizedError::GetAppErrorStrings(failed_url, extension, locale, |
| 1146 &error_strings); | 1147 &error_strings); |
| 1147 // "t" is the id of the template's root node. | 1148 // "t" is the id of the template's root node. |
| 1148 *error_html = webui::GetTemplatesHtml(template_html, &error_strings, | 1149 *error_html = webui::GetTemplatesHtml(template_html, &error_strings, |
| 1149 "t"); | 1150 "t"); |
| 1150 } | 1151 } |
| 1151 #endif | 1152 #endif |
| 1152 } else { | 1153 } else { |
| 1153 // TODO(ellyjones): change GetNavigationErrorStrings to take a RenderFrame | 1154 // TODO(ellyjones): change GetNavigationErrorStrings to take a RenderFrame |
| 1154 // instead of a RenderView, then pass that in. | 1155 // instead of a RenderView, then pass that in. |
| 1155 // This is safe for now because we only install the NetErrorHelper on the | 1156 // This is safe for now because we only install the NetErrorHelper on the |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1590 if (mime_type == content::kBrowserPluginMimeType) { | 1591 if (mime_type == content::kBrowserPluginMimeType) { |
| 1591 return new extensions::ExtensionsGuestViewContainer(render_frame); | 1592 return new extensions::ExtensionsGuestViewContainer(render_frame); |
| 1592 } else { | 1593 } else { |
| 1593 return new extensions::MimeHandlerViewContainer( | 1594 return new extensions::MimeHandlerViewContainer( |
| 1594 render_frame, mime_type, original_url); | 1595 render_frame, mime_type, original_url); |
| 1595 } | 1596 } |
| 1596 #else | 1597 #else |
| 1597 return NULL; | 1598 return NULL; |
| 1598 #endif | 1599 #endif |
| 1599 } | 1600 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 880313002:
webui: add [lang] attribute to <html> element on all webui pages so (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master