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

Side by Side Diff: chrome_frame/metrics_service.cc

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « chrome_frame/external_tab_test.cc ('k') | chrome_frame/test/urlmon_moniker_integration_test.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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include <bzlib.h> 51 #include <bzlib.h>
52 #else 52 #else
53 #include "third_party/bzip2/bzlib.h" 53 #include "third_party/bzip2/bzlib.h"
54 #endif 54 #endif
55 55
56 #include "base/file_version_info.h" 56 #include "base/file_version_info.h"
57 #include "base/lock.h" 57 #include "base/lock.h"
58 #include "base/string_split.h" 58 #include "base/string_split.h"
59 #include "base/string_util.h" 59 #include "base/string_util.h"
60 #include "base/stringprintf.h" 60 #include "base/stringprintf.h"
61 #include "base/thread.h" 61 #include "base/threading/thread.h"
62 #include "base/string_number_conversions.h" 62 #include "base/string_number_conversions.h"
63 #include "base/utf_string_conversions.h" 63 #include "base/utf_string_conversions.h"
64 #include "chrome/common/chrome_version_info.h" 64 #include "chrome/common/chrome_version_info.h"
65 #include "chrome/common/net/url_fetcher.h" 65 #include "chrome/common/net/url_fetcher.h"
66 #include "chrome/common/net/url_request_context_getter.h" 66 #include "chrome/common/net/url_request_context_getter.h"
67 #include "chrome/installer/util/browser_distribution.h" 67 #include "chrome/installer/util/browser_distribution.h"
68 #include "chrome/installer/util/chrome_frame_distribution.h" 68 #include "chrome/installer/util/chrome_frame_distribution.h"
69 #include "chrome/installer/util/google_update_settings.h" 69 #include "chrome/installer/util/google_update_settings.h"
70 #include "chrome_frame/bind_status_callback_impl.h" 70 #include "chrome_frame/bind_status_callback_impl.h"
71 #include "chrome_frame/chrome_frame_delegate.h" 71 #include "chrome_frame/chrome_frame_delegate.h"
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 version += "-F"; 615 version += "-F";
616 if (!version_info.IsOfficialBuild()) 616 if (!version_info.IsOfficialBuild())
617 version.append("-devel"); 617 version.append("-devel");
618 return version; 618 return version;
619 } else { 619 } else {
620 NOTREACHED() << "Unable to retrieve version string."; 620 NOTREACHED() << "Unable to retrieve version string.";
621 } 621 }
622 622
623 return std::string(); 623 return std::string();
624 } 624 }
OLDNEW
« no previous file with comments | « chrome_frame/external_tab_test.cc ('k') | chrome_frame/test/urlmon_moniker_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698