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

Side by Side Diff: chrome_frame/metrics_service.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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_frame/chrome_frame_npapi.cc ('k') | net/base/host_mapping_rules.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 5
6 //------------------------------------------------------------------------------ 6 //------------------------------------------------------------------------------
7 // Description of the life cycle of a instance of MetricsService. 7 // Description of the life cycle of a instance of MetricsService.
8 // 8 //
9 // OVERVIEW 9 // OVERVIEW
10 // 10 //
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include <objbase.h> 46 #include <objbase.h>
47 47
48 #if defined(USE_SYSTEM_LIBBZ2) 48 #if defined(USE_SYSTEM_LIBBZ2)
49 #include <bzlib.h> 49 #include <bzlib.h>
50 #else 50 #else
51 #include "third_party/bzip2/bzlib.h" 51 #include "third_party/bzip2/bzlib.h"
52 #endif 52 #endif
53 53
54 #include "base/file_version_info.h" 54 #include "base/file_version_info.h"
55 #include "base/lock.h" 55 #include "base/lock.h"
56 #include "base/string_split.h"
56 #include "base/string_util.h" 57 #include "base/string_util.h"
57 #include "base/thread.h" 58 #include "base/thread.h"
58 #include "base/string_number_conversions.h" 59 #include "base/string_number_conversions.h"
59 #include "base/utf_string_conversions.h" 60 #include "base/utf_string_conversions.h"
60 #include "chrome/common/chrome_version_info.h" 61 #include "chrome/common/chrome_version_info.h"
61 #include "chrome/common/net/url_fetcher.h" 62 #include "chrome/common/net/url_fetcher.h"
62 #include "chrome/common/net/url_fetcher_protect.h" 63 #include "chrome/common/net/url_fetcher_protect.h"
63 #include "chrome/common/net/url_request_context_getter.h" 64 #include "chrome/common/net/url_request_context_getter.h"
64 #include "chrome/installer/util/browser_distribution.h" 65 #include "chrome/installer/util/browser_distribution.h"
65 #include "chrome/installer/util/chrome_frame_distribution.h" 66 #include "chrome/installer/util/chrome_frame_distribution.h"
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 version += "-F"; 596 version += "-F";
596 if (!version_info.IsOfficialBuild()) 597 if (!version_info.IsOfficialBuild())
597 version.append("-devel"); 598 version.append("-devel");
598 return version; 599 return version;
599 } else { 600 } else {
600 NOTREACHED() << "Unable to retrieve version string."; 601 NOTREACHED() << "Unable to retrieve version string.";
601 } 602 }
602 603
603 return std::string(); 604 return std::string();
604 } 605 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_npapi.cc ('k') | net/base/host_mapping_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698