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

Side by Side Diff: chrome/installer/setup/setup_util.cc

Issue 194118: Add a new flag to the installer to prevent registering for a Google Update la... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/installer/setup/setup_main.cc ('k') | chrome/installer/util/master_preferences.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 declares util functions for setup project. 5 // This file declares util functions for setup project.
6 6
7 #include "chrome/installer/setup/setup_util.h" 7 #include "chrome/installer/setup/setup_util.h"
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 prefs = new DictionaryValue(); 47 prefs = new DictionaryValue();
48 48
49 if (cmd_line.HasSwitch(installer_util::switches::kCreateAllShortcuts)) 49 if (cmd_line.HasSwitch(installer_util::switches::kCreateAllShortcuts))
50 installer_util::SetDistroBooleanPreference( 50 installer_util::SetDistroBooleanPreference(
51 prefs, installer_util::master_preferences::kCreateAllShortcuts, true); 51 prefs, installer_util::master_preferences::kCreateAllShortcuts, true);
52 52
53 if (cmd_line.HasSwitch(installer_util::switches::kDoNotCreateShortcuts)) 53 if (cmd_line.HasSwitch(installer_util::switches::kDoNotCreateShortcuts))
54 installer_util::SetDistroBooleanPreference( 54 installer_util::SetDistroBooleanPreference(
55 prefs, installer_util::master_preferences::kDoNotCreateShortcuts, true); 55 prefs, installer_util::master_preferences::kDoNotCreateShortcuts, true);
56 56
57 if (cmd_line.HasSwitch(
58 installer_util::switches::kDoNotRegisterForUpdateLaunch))
59 installer_util::SetDistroBooleanPreference(
60 prefs,
61 installer_util::master_preferences::kDoNotRegisterForUpdateLaunch,
62 true);
63
57 if (cmd_line.HasSwitch(installer_util::switches::kDoNotLaunchChrome)) 64 if (cmd_line.HasSwitch(installer_util::switches::kDoNotLaunchChrome))
58 installer_util::SetDistroBooleanPreference( 65 installer_util::SetDistroBooleanPreference(
59 prefs, installer_util::master_preferences::kDoNotLaunchChrome, true); 66 prefs, installer_util::master_preferences::kDoNotLaunchChrome, true);
60 67
61 if (cmd_line.HasSwitch(installer_util::switches::kMakeChromeDefault)) 68 if (cmd_line.HasSwitch(installer_util::switches::kMakeChromeDefault))
62 installer_util::SetDistroBooleanPreference( 69 installer_util::SetDistroBooleanPreference(
63 prefs, installer_util::master_preferences::kMakeChromeDefault, true); 70 prefs, installer_util::master_preferences::kMakeChromeDefault, true);
64 71
65 if (cmd_line.HasSwitch(installer_util::switches::kSystemLevel)) 72 if (cmd_line.HasSwitch(installer_util::switches::kSystemLevel))
66 installer_util::SetDistroBooleanPreference( 73 installer_util::SetDistroBooleanPreference(
(...skipping 28 matching lines...) Expand all
95 LOG(INFO) << "directory found: " << find_data.cFileName; 102 LOG(INFO) << "directory found: " << find_data.cFileName;
96 version = installer::Version::GetVersionFromString(find_data.cFileName); 103 version = installer::Version::GetVersionFromString(find_data.cFileName);
97 if (version) break; 104 if (version) break;
98 } 105 }
99 ret = FindNextFile(file_handle, &find_data); 106 ret = FindNextFile(file_handle, &find_data);
100 } 107 }
101 FindClose(file_handle); 108 FindClose(file_handle);
102 109
103 return version; 110 return version;
104 } 111 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/setup_main.cc ('k') | chrome/installer/util/master_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698