Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1612663002: Use a valid /prefetch argument when launching a process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bit
Patch Set: address comments from gab #13 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 #include "ppapi/host/ppapi_host.h" 161 #include "ppapi/host/ppapi_host.h"
162 #include "storage/browser/fileapi/external_mount_points.h" 162 #include "storage/browser/fileapi/external_mount_points.h"
163 #include "ui/base/l10n/l10n_util.h" 163 #include "ui/base/l10n/l10n_util.h"
164 #include "ui/base/resource/resource_bundle.h" 164 #include "ui/base/resource/resource_bundle.h"
165 #include "ui/resources/grit/ui_resources.h" 165 #include "ui/resources/grit/ui_resources.h"
166 166
167 #if defined(OS_WIN) 167 #if defined(OS_WIN)
168 #include "base/strings/string_tokenizer.h" 168 #include "base/strings/string_tokenizer.h"
169 #include "base/win/windows_version.h" 169 #include "base/win/windows_version.h"
170 #include "chrome/browser/chrome_browser_main_win.h" 170 #include "chrome/browser/chrome_browser_main_win.h"
171 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win. h"
171 #include "sandbox/win/src/sandbox_policy.h" 172 #include "sandbox/win/src/sandbox_policy.h"
172 #elif defined(OS_MACOSX) 173 #elif defined(OS_MACOSX)
173 #include "chrome/browser/chrome_browser_main_mac.h" 174 #include "chrome/browser/chrome_browser_main_mac.h"
174 #elif defined(OS_CHROMEOS) 175 #elif defined(OS_CHROMEOS)
175 #include "chrome/browser/chromeos/attestation/platform_verification_impl.h" 176 #include "chrome/browser/chromeos/attestation/platform_verification_impl.h"
176 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 177 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
177 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" 178 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
178 #include "chrome/browser/chromeos/file_manager/app_id.h" 179 #include "chrome/browser/chromeos/file_manager/app_id.h"
179 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 180 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
180 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 181 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
(...skipping 2505 matching lines...) Expand 10 before | Expand all | Expand 10 after
2686 2687
2687 base::StringTokenizer tokenizer(mime_types, ","); 2688 base::StringTokenizer tokenizer(mime_types, ",");
2688 tokenizer.set_quote_chars("\""); 2689 tokenizer.set_quote_chars("\"");
2689 while (tokenizer.GetNext()) { 2690 while (tokenizer.GetNext()) {
2690 if (tokenizer.token() == mime_type) 2691 if (tokenizer.token() == mime_type)
2691 return true; 2692 return true;
2692 } 2693 }
2693 2694
2694 return false; 2695 return false;
2695 } 2696 }
2697
2698 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const {
2699 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument;
2700 }
2696 #endif // defined(OS_WIN) 2701 #endif // defined(OS_WIN)
2697 2702
2698 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( 2703 void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
2699 content::ServiceRegistry* registry, 2704 content::ServiceRegistry* registry,
2700 content::RenderFrameHost* render_frame_host) { 2705 content::RenderFrameHost* render_frame_host) {
2701 #if defined(OS_CHROMEOS) 2706 #if defined(OS_CHROMEOS)
2702 registry->AddService( 2707 registry->AddService(
2703 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2708 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2704 render_frame_host)); 2709 render_frame_host));
2705 #endif 2710 #endif
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
2889 if (channel <= kMaxDisableEncryptionChannel) { 2894 if (channel <= kMaxDisableEncryptionChannel) {
2890 static const char* const kWebRtcDevSwitchNames[] = { 2895 static const char* const kWebRtcDevSwitchNames[] = {
2891 switches::kDisableWebRtcEncryption, 2896 switches::kDisableWebRtcEncryption,
2892 }; 2897 };
2893 to_command_line->CopySwitchesFrom(from_command_line, 2898 to_command_line->CopySwitchesFrom(from_command_line,
2894 kWebRtcDevSwitchNames, 2899 kWebRtcDevSwitchNames,
2895 arraysize(kWebRtcDevSwitchNames)); 2900 arraysize(kWebRtcDevSwitchNames));
2896 } 2901 }
2897 } 2902 }
2898 #endif // defined(ENABLE_WEBRTC) 2903 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698