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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 1315303002: Dispatch DRP IPC call from renderer main thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Override CanSendWhileSwappedOut Created 5 years, 3 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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #endif // defined(OS_LINUX) 9 #endif // defined(OS_LINUX)
10 10
(...skipping 12 matching lines...) Expand all
23 #include "build/build_config.h" 23 #include "build/build_config.h"
24 #include "chrome/common/child_process_logging.h" 24 #include "chrome/common/child_process_logging.h"
25 #include "chrome/common/chrome_constants.h" 25 #include "chrome/common/chrome_constants.h"
26 #include "chrome/common/chrome_paths.h" 26 #include "chrome/common/chrome_paths.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/crash_keys.h" 28 #include "chrome/common/crash_keys.h"
29 #include "chrome/common/pepper_flash.h" 29 #include "chrome/common/pepper_flash.h"
30 #include "chrome/common/secure_origin_whitelist.h" 30 #include "chrome/common/secure_origin_whitelist.h"
31 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
32 #include "chrome/grit/common_resources.h" 32 #include "chrome/grit/common_resources.h"
33 #include "components/data_reduction_proxy/content/common/data_reduction_proxy_me ssages.h"
33 #include "components/dom_distiller/core/url_constants.h" 34 #include "components/dom_distiller/core/url_constants.h"
34 #include "components/version_info/version_info.h" 35 #include "components/version_info/version_info.h"
35 #include "content/public/common/content_constants.h" 36 #include "content/public/common/content_constants.h"
36 #include "content/public/common/content_switches.h" 37 #include "content/public/common/content_switches.h"
37 #include "content/public/common/url_constants.h" 38 #include "content/public/common/url_constants.h"
38 #include "content/public/common/user_agent.h" 39 #include "content/public/common/user_agent.h"
39 #include "extensions/common/constants.h" 40 #include "extensions/common/constants.h"
40 #include "gpu/config/gpu_info.h" 41 #include "gpu/config/gpu_info.h"
41 #include "net/http/http_util.h" 42 #include "net/http/http_util.h"
42 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 schemes->insert(content::kChromeUIScheme); 604 schemes->insert(content::kChromeUIScheme);
604 schemes->insert(extensions::kExtensionScheme); 605 schemes->insert(extensions::kExtensionScheme);
605 schemes->insert(extensions::kExtensionResourceScheme); 606 schemes->insert(extensions::kExtensionResourceScheme);
606 GetSecureOriginWhitelist(origins); 607 GetSecureOriginWhitelist(origins);
607 } 608 }
608 609
609 void ChromeContentClient::AddServiceWorkerSchemes( 610 void ChromeContentClient::AddServiceWorkerSchemes(
610 std::set<std::string>* schemes) { 611 std::set<std::string>* schemes) {
611 schemes->insert(extensions::kExtensionScheme); 612 schemes->insert(extensions::kExtensionScheme);
612 } 613 }
614
615 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* message) {
616 return content::ContentClient::CanSendWhileSwappedOut(message) ||
Charlie Reis 2015/09/02 17:16:30 Remove this first clause. The default implementat
tbansal1 2015/09/02 17:30:26 Added DCHECK. Please let me know if that's not cor
617 message->type() ==
618 DataReductionProxyViewHostMsg_DataReductionProxyStatus::ID;
619 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698