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

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

Issue 136203009: Support auto-reload on errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: MockableOneShotTimer -> base::Timer (now mockable!) Created 6 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/app/generated_resources.grd ('k') | chrome/browser/errorpage_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 1559 matching lines...) Expand 10 before | Expand all | Expand 10 after
1570 switches::kDisableExtensionsResourceWhitelist, 1570 switches::kDisableExtensionsResourceWhitelist,
1571 switches::kDisablePnacl, 1571 switches::kDisablePnacl,
1572 switches::kDisableScriptedPrintThrottling, 1572 switches::kDisableScriptedPrintThrottling,
1573 switches::kEnableAdview, 1573 switches::kEnableAdview,
1574 switches::kEnableAppWindowControls, 1574 switches::kEnableAppWindowControls,
1575 switches::kEnableBenchmarking, 1575 switches::kEnableBenchmarking,
1576 switches::kEnableNaCl, 1576 switches::kEnableNaCl,
1577 switches::kEnableNaClDebug, 1577 switches::kEnableNaClDebug,
1578 switches::kEnableNaClNonSfiMode, 1578 switches::kEnableNaClNonSfiMode,
1579 switches::kEnableNetBenchmarking, 1579 switches::kEnableNetBenchmarking,
1580 switches::kEnableOfflineAutoReload,
1580 switches::kEnableStreamlinedHostedApps, 1581 switches::kEnableStreamlinedHostedApps,
1581 switches::kEnableWatchdog, 1582 switches::kEnableWatchdog,
1582 switches::kMemoryProfiling, 1583 switches::kMemoryProfiling,
1583 switches::kMessageLoopHistogrammer, 1584 switches::kMessageLoopHistogrammer,
1584 switches::kNoJsRandomness, 1585 switches::kNoJsRandomness,
1585 switches::kOutOfProcessPdf, 1586 switches::kOutOfProcessPdf,
1586 switches::kPlaybackMode, 1587 switches::kPlaybackMode,
1587 switches::kPpapiFlashArgs, 1588 switches::kPpapiFlashArgs,
1588 switches::kPpapiFlashPath, 1589 switches::kPpapiFlashPath,
1589 switches::kPpapiFlashVersion, 1590 switches::kPpapiFlashVersion,
(...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after
2731 switches::kDisableWebRtcEncryption, 2732 switches::kDisableWebRtcEncryption,
2732 }; 2733 };
2733 to_command_line->CopySwitchesFrom(from_command_line, 2734 to_command_line->CopySwitchesFrom(from_command_line,
2734 kWebRtcDevSwitchNames, 2735 kWebRtcDevSwitchNames,
2735 arraysize(kWebRtcDevSwitchNames)); 2736 arraysize(kWebRtcDevSwitchNames));
2736 } 2737 }
2737 } 2738 }
2738 #endif // defined(ENABLE_WEBRTC) 2739 #endif // defined(ENABLE_WEBRTC)
2739 2740
2740 } // namespace chrome 2741 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698