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

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: Reinstate original pickle order; add scripts clause to content_script_chrome_url_invalid.json to av… 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 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 switches::kEnableBenchmarking, 1163 switches::kEnableBenchmarking,
1164 switches::kEnableExperimentalExtensionApis, 1164 switches::kEnableExperimentalExtensionApis,
1165 switches::kEnableExperimentalFormFilling, 1165 switches::kEnableExperimentalFormFilling,
1166 switches::kEnableIPCFuzzing, 1166 switches::kEnableIPCFuzzing,
1167 switches::kEnableInteractiveAutocomplete, 1167 switches::kEnableInteractiveAutocomplete,
1168 switches::kEnableNaCl, 1168 switches::kEnableNaCl,
1169 switches::kEnableNetBenchmarking, 1169 switches::kEnableNetBenchmarking,
1170 switches::kEnablePasswordGeneration, 1170 switches::kEnablePasswordGeneration,
1171 switches::kEnablePnacl, 1171 switches::kEnablePnacl,
1172 switches::kEnableWatchdog, 1172 switches::kEnableWatchdog,
1173 switches::kExtensionsOnChromeURLs,
1173 switches::kMemoryProfiling, 1174 switches::kMemoryProfiling,
1174 switches::kMessageLoopHistogrammer, 1175 switches::kMessageLoopHistogrammer,
1175 switches::kNoJsRandomness, 1176 switches::kNoJsRandomness,
1176 switches::kPerformCrashAnalysis, 1177 switches::kPerformCrashAnalysis,
1177 switches::kPlaybackMode, 1178 switches::kPlaybackMode,
1178 switches::kPpapiFlashArgs, 1179 switches::kPpapiFlashArgs,
1179 switches::kPpapiFlashInProcess, 1180 switches::kPpapiFlashInProcess,
1180 switches::kPpapiFlashPath, 1181 switches::kPpapiFlashPath,
1181 switches::kPpapiFlashVersion, 1182 switches::kPpapiFlashVersion,
1182 switches::kProfilingAtStart, 1183 switches::kProfilingAtStart,
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 io_thread_application_locale_ = locale; 2156 io_thread_application_locale_ = locale;
2156 } 2157 }
2157 2158
2158 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2159 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2159 const std::string& locale) { 2160 const std::string& locale) {
2160 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2161 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2161 io_thread_application_locale_ = locale; 2162 io_thread_application_locale_ = locale;
2162 } 2163 }
2163 2164
2164 } // namespace chrome 2165 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/active_tab_permission_granter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698