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

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: Add UMA Created 6 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 1616 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && 1627 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) &&
1628 !command_line->HasSwitch(switches::kDisableBreakpad)) 1628 !command_line->HasSwitch(switches::kDisableBreakpad))
1629 command_line->AppendSwitch(switches::kDisableBreakpad); 1629 command_line->AppendSwitch(switches::kDisableBreakpad);
1630 } 1630 }
1631 1631
1632 // The command line switch kEnableBenchmarking needs to be specified along 1632 // The command line switch kEnableBenchmarking needs to be specified along
1633 // with the kEnableStatsTable switch to ensure that the stats table global 1633 // with the kEnableStatsTable switch to ensure that the stats table global
1634 // is initialized correctly. 1634 // is initialized correctly.
1635 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 1635 if (command_line->HasSwitch(switches::kEnableBenchmarking))
1636 DCHECK(command_line->HasSwitch(switches::kEnableStatsTable)); 1636 DCHECK(command_line->HasSwitch(switches::kEnableStatsTable));
1637
1638 if (VersionInfo::GetChannel() <= VersionInfo::CHANNEL_DEV)
1639 command_line->AppendSwitch(switches::kEnableOfflineAutoReload);
1637 } 1640 }
1638 1641
1639 std::string ChromeContentBrowserClient::GetApplicationLocale() { 1642 std::string ChromeContentBrowserClient::GetApplicationLocale() {
1640 if (BrowserThread::CurrentlyOn(BrowserThread::IO)) 1643 if (BrowserThread::CurrentlyOn(BrowserThread::IO))
1641 return g_io_thread_application_locale.Get(); 1644 return g_io_thread_application_locale.Get();
1642 return g_browser_process->GetApplicationLocale(); 1645 return g_browser_process->GetApplicationLocale();
1643 } 1646 }
1644 1647
1645 std::string ChromeContentBrowserClient::GetAcceptLangs( 1648 std::string ChromeContentBrowserClient::GetAcceptLangs(
1646 content::BrowserContext* context) { 1649 content::BrowserContext* context) {
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
2700 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2703 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2701 // Chromium builds as well. 2704 // Chromium builds as well.
2702 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2705 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2703 #else 2706 #else
2704 return false; 2707 return false;
2705 #endif 2708 #endif
2706 } 2709 }
2707 2710
2708 2711
2709 } // namespace chrome 2712 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698