| 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 19 matching lines...) Expand all  Loading... | 
| 30 #include "chrome/common/crash_keys.h" | 30 #include "chrome/common/crash_keys.h" | 
| 31 #include "chrome/common/features.h" | 31 #include "chrome/common/features.h" | 
| 32 #include "chrome/common/pause_tabs_field_trial.h" | 32 #include "chrome/common/pause_tabs_field_trial.h" | 
| 33 #include "chrome/common/pepper_permission_util.h" | 33 #include "chrome/common/pepper_permission_util.h" | 
| 34 #include "chrome/common/prerender_types.h" | 34 #include "chrome/common/prerender_types.h" | 
| 35 #include "chrome/common/render_messages.h" | 35 #include "chrome/common/render_messages.h" | 
| 36 #include "chrome/common/secure_origin_whitelist.h" | 36 #include "chrome/common/secure_origin_whitelist.h" | 
| 37 #include "chrome/common/url_constants.h" | 37 #include "chrome/common/url_constants.h" | 
| 38 #include "chrome/grit/chromium_strings.h" | 38 #include "chrome/grit/chromium_strings.h" | 
| 39 #include "chrome/grit/generated_resources.h" | 39 #include "chrome/grit/generated_resources.h" | 
| 40 #include "chrome/grit/locale_settings.h" |  | 
| 41 #include "chrome/grit/renderer_resources.h" | 40 #include "chrome/grit/renderer_resources.h" | 
| 42 #include "chrome/renderer/app_categorizer.h" | 41 #include "chrome/renderer/app_categorizer.h" | 
| 43 #include "chrome/renderer/benchmarking_extension.h" | 42 #include "chrome/renderer/benchmarking_extension.h" | 
| 44 #include "chrome/renderer/chrome_render_frame_observer.h" | 43 #include "chrome/renderer/chrome_render_frame_observer.h" | 
| 45 #include "chrome/renderer/chrome_render_thread_observer.h" | 44 #include "chrome/renderer/chrome_render_thread_observer.h" | 
| 46 #include "chrome/renderer/chrome_render_view_observer.h" | 45 #include "chrome/renderer/chrome_render_view_observer.h" | 
| 47 #include "chrome/renderer/content_settings_observer.h" | 46 #include "chrome/renderer/content_settings_observer.h" | 
| 48 #include "chrome/renderer/loadtimes_extension_bindings.h" | 47 #include "chrome/renderer/loadtimes_extension_bindings.h" | 
| 49 #include "chrome/renderer/net/net_error_helper.h" | 48 #include "chrome/renderer/net/net_error_helper.h" | 
| 50 #include "chrome/renderer/net_benchmarking_extension.h" | 49 #include "chrome/renderer/net_benchmarking_extension.h" | 
| (...skipping 1520 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1571 | 1570 | 
| 1572   RecordYouTubeRewriteUMA(result); | 1571   RecordYouTubeRewriteUMA(result); | 
| 1573   return corrected_url.ReplaceComponents(r); | 1572   return corrected_url.ReplaceComponents(r); | 
| 1574 } | 1573 } | 
| 1575 | 1574 | 
| 1576 std::unique_ptr<base::TaskScheduler::InitParams> | 1575 std::unique_ptr<base::TaskScheduler::InitParams> | 
| 1577 ChromeContentRendererClient::GetTaskSchedulerInitParams() { | 1576 ChromeContentRendererClient::GetTaskSchedulerInitParams() { | 
| 1578   return task_scheduler_util:: | 1577   return task_scheduler_util:: | 
| 1579       GetRendererTaskSchedulerInitParamsFromCommandLine(); | 1578       GetRendererTaskSchedulerInitParamsFromCommandLine(); | 
| 1580 } | 1579 } | 
| OLD | NEW | 
|---|