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

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

Issue 181153002: Have PNaCl use debug pexe URL instead of stripped pexe w/ kEnableNaClDebug (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nosandbox win Created 6 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 | Annotate | Revision Log
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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "chrome/common/pref_names.h" 98 #include "chrome/common/pref_names.h"
99 #include "chrome/common/profile_management_switches.h" 99 #include "chrome/common/profile_management_switches.h"
100 #include "chrome/common/render_messages.h" 100 #include "chrome/common/render_messages.h"
101 #include "chrome/common/url_constants.h" 101 #include "chrome/common/url_constants.h"
102 #include "chrome/installer/util/google_update_settings.h" 102 #include "chrome/installer/util/google_update_settings.h"
103 #include "chromeos/chromeos_constants.h" 103 #include "chromeos/chromeos_constants.h"
104 #include "components/nacl/browser/nacl_browser.h" 104 #include "components/nacl/browser/nacl_browser.h"
105 #include "components/nacl/browser/nacl_host_message_filter.h" 105 #include "components/nacl/browser/nacl_host_message_filter.h"
106 #include "components/nacl/browser/nacl_process_host.h" 106 #include "components/nacl/browser/nacl_process_host.h"
107 #include "components/nacl/common/nacl_process_type.h" 107 #include "components/nacl/common/nacl_process_type.h"
108 #include "components/nacl/common/nacl_switches.h"
108 #include "components/translate/core/common/translate_switches.h" 109 #include "components/translate/core/common/translate_switches.h"
109 #include "components/user_prefs/pref_registry_syncable.h" 110 #include "components/user_prefs/pref_registry_syncable.h"
110 #include "content/public/browser/browser_child_process_host.h" 111 #include "content/public/browser/browser_child_process_host.h"
111 #include "content/public/browser/browser_main_parts.h" 112 #include "content/public/browser/browser_main_parts.h"
112 #include "content/public/browser/browser_ppapi_host.h" 113 #include "content/public/browser/browser_ppapi_host.h"
113 #include "content/public/browser/browser_thread.h" 114 #include "content/public/browser/browser_thread.h"
114 #include "content/public/browser/browser_url_handler.h" 115 #include "content/public/browser/browser_url_handler.h"
115 #include "content/public/browser/child_process_data.h" 116 #include "content/public/browser/child_process_data.h"
116 #include "content/public/browser/child_process_security_policy.h" 117 #include "content/public/browser/child_process_security_policy.h"
117 #include "content/public/browser/render_frame_host.h" 118 #include "content/public/browser/render_frame_host.h"
(...skipping 1459 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 switches::kAppsGalleryURL, 1578 switches::kAppsGalleryURL,
1578 switches::kCloudPrintServiceURL, 1579 switches::kCloudPrintServiceURL,
1579 switches::kDisableBundledPpapiFlash, 1580 switches::kDisableBundledPpapiFlash,
1580 switches::kDisableExtensionsResourceWhitelist, 1581 switches::kDisableExtensionsResourceWhitelist,
1581 switches::kDisablePnacl, 1582 switches::kDisablePnacl,
1582 switches::kDisableScriptedPrintThrottling, 1583 switches::kDisableScriptedPrintThrottling,
1583 switches::kEnableAdview, 1584 switches::kEnableAdview,
1584 switches::kEnableAppWindowControls, 1585 switches::kEnableAppWindowControls,
1585 switches::kEnableBenchmarking, 1586 switches::kEnableBenchmarking,
1586 switches::kEnableNaCl, 1587 switches::kEnableNaCl,
1588 switches::kEnableNaClDebug,
1587 switches::kEnableNetBenchmarking, 1589 switches::kEnableNetBenchmarking,
1588 switches::kEnableStreamlinedHostedApps, 1590 switches::kEnableStreamlinedHostedApps,
1589 switches::kEnableWatchdog, 1591 switches::kEnableWatchdog,
1590 switches::kMemoryProfiling, 1592 switches::kMemoryProfiling,
1591 switches::kMessageLoopHistogrammer, 1593 switches::kMessageLoopHistogrammer,
1592 switches::kNoJsRandomness, 1594 switches::kNoJsRandomness,
1593 switches::kOutOfProcessPdf, 1595 switches::kOutOfProcessPdf,
1594 switches::kPlaybackMode, 1596 switches::kPlaybackMode,
1595 switches::kPpapiFlashArgs, 1597 switches::kPpapiFlashArgs,
1596 switches::kPpapiFlashPath, 1598 switches::kPpapiFlashPath,
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2719 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2721 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2720 // Chromium builds as well. 2722 // Chromium builds as well.
2721 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2723 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2722 #else 2724 #else
2723 return false; 2725 return false;
2724 #endif 2726 #endif
2725 } 2727 }
2726 2728
2727 2729
2728 } // namespace chrome 2730 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/nacl/nacl_test_data.gyp » ('j') | chrome/test/data/nacl/pnacl_debug_url/pnacl_debug_url.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698