chrome/browser/browser_main_win.cc - Issue 6840003: first-run: Refactor Upgrade class into a common upgrade_util API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/browser_main_win.cc

Issue 6840003: first-run: Refactor Upgrade class into a common upgrade_util API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: upgrade_utils -> upgrade_util Created 9 years, 8 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:

Index: chrome/browser/browser_main_win.cc

diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc

index ee8f9eb1e1b33cf331b4ba8c7236e4ffa689945b..fc69fcdf1807a779c74dfd3ba5644f94acdee25d 100644

--- a/chrome/browser/browser_main_win.cc

+++ b/chrome/browser/browser_main_win.cc

@@ -21,7 +21,7 @@

#include "base/win/windows_version.h"

#include "base/win/wrapped_window_proc.h"

#include "chrome/browser/first_run/first_run.h"

-#include "chrome/browser/first_run/upgrade.h"

+#include "chrome/browser/first_run/upgrade_util.h"

#include "chrome/browser/metrics/metrics_service.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/views/uninstall_view.h"

@@ -110,7 +110,7 @@ int DoUninstallTasks(bool chrome_still_running) {

return ResultCodes::UNINSTALL_CHROME_ALIVE;

}

int ret = AskForUninstallConfirmation();

- if (Upgrade::IsBrowserAlreadyRunning()) {

+ if (upgrade_util::IsBrowserAlreadyRunning()) {

ShowCloseBrowserFirstMessageBox();

return ResultCodes::UNINSTALL_CHROME_ALIVE;

}

« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »