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

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

Issue 1899433002: Update flags used by offline pages and bookmarks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test Created 4 years, 8 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/android/offline_pages/offline_page_utils_unittest.cc ('k') | chrome/chrome.gyp » ('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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 #include "chrome/browser/chromeos/system/input_device_settings.h" 198 #include "chrome/browser/chromeos/system/input_device_settings.h"
199 #include "chromeos/chromeos_switches.h" 199 #include "chromeos/chromeos_switches.h"
200 #include "components/user_manager/user_manager.h" 200 #include "components/user_manager/user_manager.h"
201 #elif defined(OS_LINUX) 201 #elif defined(OS_LINUX)
202 #include "chrome/browser/chrome_browser_main_linux.h" 202 #include "chrome/browser/chrome_browser_main_linux.h"
203 #elif defined(OS_ANDROID) 203 #elif defined(OS_ANDROID)
204 #include "chrome/browser/chrome_browser_main_android.h" 204 #include "chrome/browser/chrome_browser_main_android.h"
205 #include "chrome/common/descriptors_android.h" 205 #include "chrome/common/descriptors_android.h"
206 #include "components/crash/content/browser/crash_dump_manager_android.h" 206 #include "components/crash/content/browser/crash_dump_manager_android.h"
207 #include "components/navigation_interception/intercept_navigation_delegate.h" 207 #include "components/navigation_interception/intercept_navigation_delegate.h"
208 #include "components/offline_pages/offline_page_switches.h"
209 #include "ui/base/resource/resource_bundle_android.h" 208 #include "ui/base/resource/resource_bundle_android.h"
210 #elif defined(OS_POSIX) 209 #elif defined(OS_POSIX)
211 #include "chrome/browser/chrome_browser_main_posix.h" 210 #include "chrome/browser/chrome_browser_main_posix.h"
212 #endif 211 #endif
213 212
214 #if defined(OS_POSIX) && !defined(OS_MACOSX) 213 #if defined(OS_POSIX) && !defined(OS_MACOSX)
215 #include "base/debug/leak_annotations.h" 214 #include "base/debug/leak_annotations.h"
216 #include "components/crash/content/app/breakpad_linux.h" 215 #include "components/crash/content/app/breakpad_linux.h"
217 #include "components/crash/content/browser/crash_handler_host_linux.h" 216 #include "components/crash/content/browser/crash_handler_host_linux.h"
218 #endif 217 #endif
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 switches::kEnableAndroidSpellChecker, 1630 switches::kEnableAndroidSpellChecker,
1632 #endif 1631 #endif
1633 switches::kEnableBenchmarking, 1632 switches::kEnableBenchmarking,
1634 switches::kEnableNaCl, 1633 switches::kEnableNaCl,
1635 #if !defined(DISABLE_NACL) 1634 #if !defined(DISABLE_NACL)
1636 switches::kEnableNaClDebug, 1635 switches::kEnableNaClDebug,
1637 switches::kEnableNaClNonSfiMode, 1636 switches::kEnableNaClNonSfiMode,
1638 #endif 1637 #endif
1639 switches::kEnableNetBenchmarking, 1638 switches::kEnableNetBenchmarking,
1640 switches::kEnableNewBookmarkApps, 1639 switches::kEnableNewBookmarkApps,
1641 #if defined(OS_ANDROID)
1642 switches::kEnableOfflinePagesAsBookmarks,
1643 #endif
1644 switches::kEnableWasm, 1640 switches::kEnableWasm,
1645 #if !defined(DISABLE_NACL) 1641 #if !defined(DISABLE_NACL)
1646 switches::kForcePNaClSubzero, 1642 switches::kForcePNaClSubzero,
1647 #endif 1643 #endif
1648 switches::kJavaScriptHarmony, 1644 switches::kJavaScriptHarmony,
1649 switches::kMessageLoopHistogrammer, 1645 switches::kMessageLoopHistogrammer,
1650 switches::kPpapiFlashArgs, 1646 switches::kPpapiFlashArgs,
1651 switches::kPpapiFlashPath, 1647 switches::kPpapiFlashPath,
1652 switches::kPpapiFlashVersion, 1648 switches::kPpapiFlashVersion,
1653 switches::kProfilingAtStart, 1649 switches::kProfilingAtStart,
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after
2961 if (channel <= kMaxDisableEncryptionChannel) { 2957 if (channel <= kMaxDisableEncryptionChannel) {
2962 static const char* const kWebRtcDevSwitchNames[] = { 2958 static const char* const kWebRtcDevSwitchNames[] = {
2963 switches::kDisableWebRtcEncryption, 2959 switches::kDisableWebRtcEncryption,
2964 }; 2960 };
2965 to_command_line->CopySwitchesFrom(from_command_line, 2961 to_command_line->CopySwitchesFrom(from_command_line,
2966 kWebRtcDevSwitchNames, 2962 kWebRtcDevSwitchNames,
2967 arraysize(kWebRtcDevSwitchNames)); 2963 arraysize(kWebRtcDevSwitchNames));
2968 } 2964 }
2969 } 2965 }
2970 #endif // defined(ENABLE_WEBRTC) 2966 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/android/offline_pages/offline_page_utils_unittest.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698