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

Side by Side Diff: chrome/installer/util/app_command.cc

Issue 1507413003: clang/win: Let some chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content_browsertests Created 5 years 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
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/installer/util/app_command.h" 5 #include "chrome/installer/util/app_command.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/win/registry.h" 8 #include "base/win/registry.h"
9 #include "chrome/installer/util/google_update_constants.h" 9 #include "chrome/installer/util/google_update_constants.h"
10 #include "chrome/installer/util/work_item_list.h" 10 #include "chrome/installer/util/work_item_list.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 result = key.ReadValue(google_update::kRegCommandLineField, &cmd_line); 51 result = key.ReadValue(google_update::kRegCommandLineField, &cmd_line);
52 if (result != ERROR_SUCCESS) { 52 if (result != ERROR_SUCCESS) {
53 LOG(WARNING) << "Error reading " << google_update::kRegCommandLineField 53 LOG(WARNING) << "Error reading " << google_update::kRegCommandLineField
54 << " value from registry: " << result; 54 << " value from registry: " << result;
55 return false; 55 return false;
56 } 56 }
57 57
58 command_line_.swap(cmd_line); 58 command_line_.swap(cmd_line);
59 59
60 for (int i = 0; i < arraysize(kNameBoolVars); ++i) { 60 for (size_t i = 0; i < arraysize(kNameBoolVars); ++i) {
61 DWORD value = 0; // Set default to false. 61 DWORD value = 0; // Set default to false.
62 // Note: ReadValueDW only modifies out param on success. 62 // Note: ReadValueDW only modifies out param on success.
63 key.ReadValueDW(kNameBoolVars[i].name, &value); 63 key.ReadValueDW(kNameBoolVars[i].name, &value);
64 this->*(kNameBoolVars[i].data) = (value != 0); 64 this->*(kNameBoolVars[i].data) = (value != 0);
65 } 65 }
66 66
67 return true; 67 return true;
68 } 68 }
69 69
70 void AppCommand::AddWorkItems(HKEY predefined_root, 70 void AppCommand::AddWorkItems(HKEY predefined_root,
71 const base::string16& command_path, 71 const base::string16& command_path,
72 WorkItemList* item_list) const { 72 WorkItemList* item_list) const {
73 // Command_path is derived from GetRegCommandKey which always returns 73 // Command_path is derived from GetRegCommandKey which always returns
74 // value from GetVersionKey() which should be 32-bit hive. 74 // value from GetVersionKey() which should be 32-bit hive.
75 item_list->AddCreateRegKeyWorkItem( 75 item_list->AddCreateRegKeyWorkItem(
76 predefined_root, command_path, KEY_WOW64_32KEY) 76 predefined_root, command_path, KEY_WOW64_32KEY)
77 ->set_log_message("creating AppCommand registry key"); 77 ->set_log_message("creating AppCommand registry key");
78 item_list->AddSetRegValueWorkItem(predefined_root, 78 item_list->AddSetRegValueWorkItem(predefined_root,
79 command_path, 79 command_path,
80 KEY_WOW64_32KEY, 80 KEY_WOW64_32KEY,
81 google_update::kRegCommandLineField, 81 google_update::kRegCommandLineField,
82 command_line_, 82 command_line_,
83 true) 83 true)
84 ->set_log_message("setting AppCommand CommandLine registry value"); 84 ->set_log_message("setting AppCommand CommandLine registry value");
85 85
86 for (int i = 0; i < arraysize(kNameBoolVars); ++i) { 86 for (size_t i = 0; i < arraysize(kNameBoolVars); ++i) {
87 const wchar_t* var_name = kNameBoolVars[i].name; 87 const wchar_t* var_name = kNameBoolVars[i].name;
88 bool var_data = this->*(kNameBoolVars[i].data); 88 bool var_data = this->*(kNameBoolVars[i].data);
89 89
90 // Adds a work item to set |var_name| to DWORD 1 if |var_data| is true; 90 // Adds a work item to set |var_name| to DWORD 1 if |var_data| is true;
91 // adds a work item to remove |var_name| otherwise. 91 // adds a work item to remove |var_name| otherwise.
92 if (var_data) { 92 if (var_data) {
93 item_list->AddSetRegValueWorkItem(predefined_root, 93 item_list->AddSetRegValueWorkItem(predefined_root,
94 command_path, 94 command_path,
95 KEY_WOW64_32KEY, 95 KEY_WOW64_32KEY,
96 var_name, 96 var_name,
97 static_cast<DWORD>(1), 97 static_cast<DWORD>(1),
98 true); 98 true);
99 } else { 99 } else {
100 item_list->AddDeleteRegValueWorkItem( 100 item_list->AddDeleteRegValueWorkItem(
101 predefined_root, command_path, KEY_WOW64_32KEY, var_name); 101 predefined_root, command_path, KEY_WOW64_32KEY, var_name);
102 } 102 }
103 } 103 }
104 } 104 }
105 105
106 } // namespace installer 106 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_path_parser_win.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698