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

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

Issue 12792005: Allow extensions on chrome:// URLs, when flag is set and permission is explicitly requested (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add a helper method to UserScript to get the appropriate valid schemes Created 7 years, 9 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 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 switches::kEnableCrxlessWebApps, 1134 switches::kEnableCrxlessWebApps,
1135 switches::kEnableExperimentalExtensionApis, 1135 switches::kEnableExperimentalExtensionApis,
1136 switches::kEnableExperimentalFormFilling, 1136 switches::kEnableExperimentalFormFilling,
1137 switches::kEnableIPCFuzzing, 1137 switches::kEnableIPCFuzzing,
1138 switches::kEnableInteractiveAutocomplete, 1138 switches::kEnableInteractiveAutocomplete,
1139 switches::kEnableNaCl, 1139 switches::kEnableNaCl,
1140 switches::kEnableNetBenchmarking, 1140 switches::kEnableNetBenchmarking,
1141 switches::kEnablePasswordGeneration, 1141 switches::kEnablePasswordGeneration,
1142 switches::kEnablePnacl, 1142 switches::kEnablePnacl,
1143 switches::kEnableWatchdog, 1143 switches::kEnableWatchdog,
1144 switches::kExtensionsOnChromeURLs,
1144 switches::kMemoryProfiling, 1145 switches::kMemoryProfiling,
1145 switches::kMessageLoopHistogrammer, 1146 switches::kMessageLoopHistogrammer,
1146 switches::kNoJsRandomness, 1147 switches::kNoJsRandomness,
1147 switches::kPerformCrashAnalysis, 1148 switches::kPerformCrashAnalysis,
1148 switches::kPlaybackMode, 1149 switches::kPlaybackMode,
1149 switches::kPpapiFlashArgs, 1150 switches::kPpapiFlashArgs,
1150 switches::kPpapiFlashInProcess, 1151 switches::kPpapiFlashInProcess,
1151 switches::kPpapiFlashPath, 1152 switches::kPpapiFlashPath,
1152 switches::kPpapiFlashVersion, 1153 switches::kPpapiFlashVersion,
1153 switches::kProfilingAtStart, 1154 switches::kProfilingAtStart,
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 io_thread_application_locale_ = locale; 2097 io_thread_application_locale_ = locale;
2097 } 2098 }
2098 2099
2099 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2100 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2100 const std::string& locale) { 2101 const std::string& locale) {
2101 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2102 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2102 io_thread_application_locale_ = locale; 2103 io_thread_application_locale_ = locale;
2103 } 2104 }
2104 2105
2105 } // namespace chrome 2106 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698