chrome/browser/browser_main_win.cc - Issue 6861001: first-run: Pull IsBrowserAlreadyRunning() out of upgrade_util_win.h.

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 6861001: first-run: Pull IsBrowserAlreadyRunning() out of upgrade_util_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 d8b8cdde806e337c24d1de381ac0e6a732b64d9b..e0a704cf7831d69cfa5b696ad4560b96a8dbd67c 100644

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

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

@@ -20,8 +20,8 @@

#include "base/win/windows_version.h"

#include "base/win/wrapped_window_proc.h"

#include "crypto/nss_util.h"

+#include "chrome/browser/browser_util_win.h"

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

-#include "chrome/browser/first_run/upgrade_util_win.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_util::IsBrowserAlreadyRunning()) {

+ if (browser_util::IsBrowserAlreadyRunning()) {

ShowCloseBrowserFirstMessageBox();

return ResultCodes::UNINSTALL_CHROME_ALIVE;

}

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