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

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

Issue 12463015: Enable <adview> tag for packaged apps. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Merge fix. 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/ad_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 switches::kAllowLegacyExtensionManifests, 1153 switches::kAllowLegacyExtensionManifests,
1154 switches::kAllowScriptingGallery, 1154 switches::kAllowScriptingGallery,
1155 switches::kAppsCheckoutURL, 1155 switches::kAppsCheckoutURL,
1156 switches::kAppsGalleryURL, 1156 switches::kAppsGalleryURL,
1157 switches::kCloudPrintServiceURL, 1157 switches::kCloudPrintServiceURL,
1158 switches::kDebugPrint, 1158 switches::kDebugPrint,
1159 switches::kDisableBundledPpapiFlash, 1159 switches::kDisableBundledPpapiFlash,
1160 switches::kDisableExtensionsResourceWhitelist, 1160 switches::kDisableExtensionsResourceWhitelist,
1161 switches::kDisableScriptedPrintThrottling, 1161 switches::kDisableScriptedPrintThrottling,
1162 switches::kDumpHistogramsOnExit, 1162 switches::kDumpHistogramsOnExit,
1163 switches::kEnableAdview,
1164 switches::kEnableAdviewSrcAttribute,
1163 switches::kEnableBenchmarking, 1165 switches::kEnableBenchmarking,
1164 switches::kEnableExperimentalExtensionApis, 1166 switches::kEnableExperimentalExtensionApis,
1165 switches::kEnableExperimentalFormFilling, 1167 switches::kEnableExperimentalFormFilling,
1166 switches::kEnableIPCFuzzing, 1168 switches::kEnableIPCFuzzing,
1167 switches::kEnableInteractiveAutocomplete, 1169 switches::kEnableInteractiveAutocomplete,
1168 switches::kEnableNaCl, 1170 switches::kEnableNaCl,
1169 switches::kEnableNetBenchmarking, 1171 switches::kEnableNetBenchmarking,
1170 switches::kEnablePasswordGeneration, 1172 switches::kEnablePasswordGeneration,
1171 switches::kEnablePnacl, 1173 switches::kEnablePnacl,
1172 switches::kEnableWatchdog, 1174 switches::kEnableWatchdog,
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 io_thread_application_locale_ = locale; 2157 io_thread_application_locale_ = locale;
2156 } 2158 }
2157 2159
2158 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2160 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2159 const std::string& locale) { 2161 const std::string& locale) {
2160 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2162 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2161 io_thread_application_locale_ = locale; 2163 io_thread_application_locale_ = locale;
2162 } 2164 }
2163 2165
2164 } // namespace chrome 2166 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/ad_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698