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

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

Issue 937843004: Disable bookmark apps on non-ChromeOS platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wow - how did that compile anywhere Created 5 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
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 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1459 switches::kDisableJavaScriptHarmonyShipping, 1459 switches::kDisableJavaScriptHarmonyShipping,
1460 switches::kDisableNewBookmarkApps, 1460 switches::kDisableNewBookmarkApps,
1461 switches::kDisableOutOfProcessPdf, 1461 switches::kDisableOutOfProcessPdf,
1462 switches::kEnableBenchmarking, 1462 switches::kEnableBenchmarking,
1463 switches::kEnableNaCl, 1463 switches::kEnableNaCl,
1464 #if !defined(DISABLE_NACL) 1464 #if !defined(DISABLE_NACL)
1465 switches::kEnableNaClDebug, 1465 switches::kEnableNaClDebug,
1466 switches::kEnableNaClNonSfiMode, 1466 switches::kEnableNaClNonSfiMode,
1467 #endif 1467 #endif
1468 switches::kEnableNetBenchmarking, 1468 switches::kEnableNetBenchmarking,
1469 switches::kEnableNewBookmarkApps,
1469 switches::kEnableOutOfProcessPdf, 1470 switches::kEnableOutOfProcessPdf,
1470 switches::kEnablePluginPlaceholderShadowDom, 1471 switches::kEnablePluginPlaceholderShadowDom,
1471 switches::kEnableShowModalDialog, 1472 switches::kEnableShowModalDialog,
1472 switches::kEnableWebBasedSignin, 1473 switches::kEnableWebBasedSignin,
1473 switches::kJavaScriptHarmony, 1474 switches::kJavaScriptHarmony,
1474 switches::kMessageLoopHistogrammer, 1475 switches::kMessageLoopHistogrammer,
1475 switches::kPlaybackMode, 1476 switches::kPlaybackMode,
1476 switches::kPpapiFlashArgs, 1477 switches::kPpapiFlashArgs,
1477 switches::kPpapiFlashPath, 1478 switches::kPpapiFlashPath,
1478 switches::kPpapiFlashVersion, 1479 switches::kPpapiFlashVersion,
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
2636 switches::kDisableWebRtcEncryption, 2637 switches::kDisableWebRtcEncryption,
2637 }; 2638 };
2638 to_command_line->CopySwitchesFrom(from_command_line, 2639 to_command_line->CopySwitchesFrom(from_command_line,
2639 kWebRtcDevSwitchNames, 2640 kWebRtcDevSwitchNames,
2640 arraysize(kWebRtcDevSwitchNames)); 2641 arraysize(kWebRtcDevSwitchNames));
2641 } 2642 }
2642 } 2643 }
2643 #endif // defined(ENABLE_WEBRTC) 2644 #endif // defined(ENABLE_WEBRTC)
2644 2645
2645 } // namespace chrome 2646 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698