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

Side by Side Diff: chrome/common/chrome_version_info_win.cc

Issue 15981010: Use a direct include of strings headers in chrome/common/, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/common/chrome_version_info.h" 5 #include "chrome/common/chrome_version_info.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/debug/profiler.h" 8 #include "base/debug/profiler.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "chrome/installer/util/google_update_settings.h" 12 #include "chrome/installer/util/google_update_settings.h"
13 #include "chrome/installer/util/install_util.h" 13 #include "chrome/installer/util/install_util.h"
14 14
15 namespace chrome { 15 namespace chrome {
16 16
17 // static 17 // static
18 std::string VersionInfo::GetVersionStringModifier() { 18 std::string VersionInfo::GetVersionStringModifier() {
19 #if defined(GOOGLE_CHROME_BUILD) 19 #if defined(GOOGLE_CHROME_BUILD)
20 base::FilePath module; 20 base::FilePath module;
21 string16 channel; 21 string16 channel;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 return CHANNEL_DEV; 59 return CHANNEL_DEV;
60 } else if (channel == L"canary") { 60 } else if (channel == L"canary") {
61 return CHANNEL_CANARY; 61 return CHANNEL_CANARY;
62 } 62 }
63 #endif 63 #endif
64 64
65 return CHANNEL_UNKNOWN; 65 return CHANNEL_UNKNOWN;
66 } 66 }
67 67
68 } // namespace chrome 68 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_version_info_android.cc ('k') | chrome/common/cloud_print/cloud_print_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698