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

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

Issue 6347033: net: Add namespace net to Sdch* classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: namespace on unittest Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 if (parsed_command_line.HasSwitch(switches::kSdchFilter)) { 1580 if (parsed_command_line.HasSwitch(switches::kSdchFilter)) {
1581 sdch_supported_domain = 1581 sdch_supported_domain =
1582 parsed_command_line.GetSwitchValueASCII(switches::kSdchFilter); 1582 parsed_command_line.GetSwitchValueASCII(switches::kSdchFilter);
1583 } else { 1583 } else {
1584 sdch_trial->AppendGroup("global_disable_sdch", 1584 sdch_trial->AppendGroup("global_disable_sdch",
1585 kSDCH_DISABLE_PROBABILITY); 1585 kSDCH_DISABLE_PROBABILITY);
1586 if (sdch_enabled != sdch_trial->group()) 1586 if (sdch_enabled != sdch_trial->group())
1587 sdch_supported_domain = "never_enabled_sdch_for_any_domain"; 1587 sdch_supported_domain = "never_enabled_sdch_for_any_domain";
1588 } 1588 }
1589 1589
1590 SdchManager sdch_manager; // Singleton database. 1590 net::SdchManager sdch_manager; // Singleton database.
1591 sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher); 1591 sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher);
1592 sdch_manager.EnableSdchSupport(sdch_supported_domain); 1592 sdch_manager.EnableSdchSupport(sdch_supported_domain);
1593 1593
1594 MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state); 1594 MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state);
1595 InstallJankometer(parsed_command_line); 1595 InstallJankometer(parsed_command_line);
1596 1596
1597 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD) 1597 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)
1598 if (parsed_command_line.HasSwitch(switches::kDebugPrint)) { 1598 if (parsed_command_line.HasSwitch(switches::kDebugPrint)) {
1599 FilePath path = 1599 FilePath path =
1600 parsed_command_line.GetSwitchValuePath(switches::kDebugPrint); 1600 parsed_command_line.GetSwitchValuePath(switches::kDebugPrint);
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 #if defined(OS_CHROMEOS) 1797 #if defined(OS_CHROMEOS)
1798 // To be precise, logout (browser shutdown) is not yet done, but the 1798 // To be precise, logout (browser shutdown) is not yet done, but the
1799 // remaining work is negligible, hence we say LogoutDone here. 1799 // remaining work is negligible, hence we say LogoutDone here.
1800 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1800 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1801 false); 1801 false);
1802 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1802 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1803 #endif 1803 #endif
1804 TRACE_EVENT_END("BrowserMain", 0, 0); 1804 TRACE_EVENT_END("BrowserMain", 0, 0);
1805 return result_code; 1805 return result_code;
1806 } 1806 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/sdch_dictionary_fetcher.h » ('j') | chrome/browser/net/sdch_dictionary_fetcher.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698