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

Side by Side Diff: chrome/test/mini_installer_test/chrome_mini_installer.cc

Issue 7706026: Remove obselete --verbose-logging flag when launching installer. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: ... Created 9 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 | « no previous file | chrome/test/mini_installer_test/mini_installer_test_util.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) 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/test/mini_installer_test/chrome_mini_installer.h" 5 #include "chrome/test/mini_installer_test/chrome_mini_installer.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process.h" 10 #include "base/process.h"
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 HKEY type = HKEY_CURRENT_USER; 586 HKEY type = HKEY_CURRENT_USER;
587 if (install_type_ == mini_installer_constants::kSystemInstall) 587 if (install_type_ == mini_installer_constants::kSystemInstall)
588 type = HKEY_LOCAL_MACHINE; 588 type = HKEY_LOCAL_MACHINE;
589 return type; 589 return type;
590 } 590 }
591 591
592 // Launches the chrome installer and waits for it to end. 592 // Launches the chrome installer and waits for it to end.
593 void ChromeMiniInstaller::LaunchInstaller(const std::wstring& path, 593 void ChromeMiniInstaller::LaunchInstaller(const std::wstring& path,
594 const wchar_t* process_name) { 594 const wchar_t* process_name) {
595 ASSERT_TRUE(file_util::PathExists(FilePath(path))); 595 ASSERT_TRUE(file_util::PathExists(FilePath(path)));
596 std::wstring launch_args(L" --verbose-logging"); 596 std::wstring launch_args;
597 if (is_chrome_frame_) { 597 if (is_chrome_frame_) {
598 launch_args.append(L" --do-not-create-shortcuts"); 598 launch_args.append(L" --do-not-create-shortcuts");
599 launch_args.append(L" --do-not-launch-chrome"); 599 launch_args.append(L" --do-not-launch-chrome");
600 launch_args.append(L" --do-not-register-for-update-launch"); 600 launch_args.append(L" --do-not-register-for-update-launch");
601 launch_args.append(L" --chrome-frame"); 601 launch_args.append(L" --chrome-frame");
602 } 602 }
603 if (install_type_ == mini_installer_constants::kSystemInstall) { 603 if (install_type_ == mini_installer_constants::kSystemInstall) {
604 launch_args.append(L" --system-level"); 604 launch_args.append(L" --system-level");
605 } 605 }
606 606
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 // This method will verify if the installed build is correct. 735 // This method will verify if the installed build is correct.
736 bool ChromeMiniInstaller::VerifyStandaloneInstall() { 736 bool ChromeMiniInstaller::VerifyStandaloneInstall() {
737 std::wstring reg_key_value_returned, standalone_installer_version; 737 std::wstring reg_key_value_returned, standalone_installer_version;
738 MiniInstallerTestUtil::GetStandaloneVersion(&standalone_installer_version); 738 MiniInstallerTestUtil::GetStandaloneVersion(&standalone_installer_version);
739 GetChromeVersionFromRegistry(&reg_key_value_returned); 739 GetChromeVersionFromRegistry(&reg_key_value_returned);
740 if (standalone_installer_version.compare(reg_key_value_returned) == 0) 740 if (standalone_installer_version.compare(reg_key_value_returned) == 0)
741 return true; 741 return true;
742 else 742 else
743 return false; 743 return false;
744 } 744 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/mini_installer_test/mini_installer_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698