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

Side by Side Diff: chrome/installer/util/shell_util.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/installer/util/compat_checks.cc ('k') | chrome/installer/util/version.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 // This file defines functions that integrate Chrome in Windows shell. These 5 // This file defines functions that integrate Chrome in Windows shell. These
6 // functions can be used by Chrome as well as Chrome installer. All of the 6 // functions can be used by Chrome as well as Chrome installer. All of the
7 // work is done by the local functions defined in anonymous namespace in 7 // work is done by the local functions defined in anonymous namespace in
8 // this class. 8 // this class.
9 9
10 #include "chrome/installer/util/shell_util.h" 10 #include "chrome/installer/util/shell_util.h"
11 11
12 #include <windows.h> 12 #include <windows.h>
13 #include <shlobj.h> 13 #include <shlobj.h>
14 14
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/file_path.h" 16 #include "base/file_path.h"
17 #include "base/file_util.h" 17 #include "base/file_util.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/registry.h" 19 #include "base/registry.h"
20 #include "base/scoped_ptr.h" 20 #include "base/scoped_ptr.h"
21 #include "base/stl_util-inl.h" 21 #include "base/stl_util-inl.h"
22 #include "base/string_number_conversions.h" 22 #include "base/string_number_conversions.h"
23 #include "base/string_split.h"
23 #include "base/string_util.h" 24 #include "base/string_util.h"
24 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
25 #include "base/values.h" 26 #include "base/values.h"
26 #include "base/win_util.h" 27 #include "base/win_util.h"
27 #include "chrome/common/chrome_constants.h" 28 #include "chrome/common/chrome_constants.h"
28 #include "chrome/common/chrome_switches.h" 29 #include "chrome/common/chrome_switches.h"
29 #include "chrome/installer/util/browser_distribution.h" 30 #include "chrome/installer/util/browser_distribution.h"
30 #include "chrome/installer/util/install_util.h" 31 #include "chrome/installer/util/install_util.h"
31 #include "chrome/installer/util/master_preferences.h" 32 #include "chrome/installer/util/master_preferences.h"
32 33
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 chrome_exe.c_str(), // target 798 chrome_exe.c_str(), // target
798 shortcut.c_str(), // shortcut 799 shortcut.c_str(), // shortcut
799 chrome_path.c_str(), // working dir 800 chrome_path.c_str(), // working dir
800 NULL, // arguments 801 NULL, // arguments
801 description.c_str(), // description 802 description.c_str(), // description
802 chrome_exe.c_str(), // icon file 803 chrome_exe.c_str(), // icon file
803 icon_index, // icon index 804 icon_index, // icon index
804 dist->GetBrowserAppId().c_str()); // app id 805 dist->GetBrowserAppId().c_str()); // app id
805 } 806 }
806 } 807 }
OLDNEW
« no previous file with comments | « chrome/installer/util/compat_checks.cc ('k') | chrome/installer/util/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698