diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
| commit | fd85ad650d68309b965dbc9f3d6823cf2754349c (patch) | |
| tree | 28b98629e02b2e05ec74272146f249ca62a164da /chrome/browser/browser_main_win.cc | |
| parent | ce072a7181ea5d58133e33654133236f5d9f5551 (diff) | |
| download | chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.zip chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.gz chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.bz2 | |
Move app/win_util to app/win and fix the namespace usage.
Split out the two classes: ScopedComInitializer and ScopedCOMem (which I renamed) to separate files.
I removed the win_util_path file which had one function in it and moved the function to win_util.
Somehow, this was getting picked up by the nacl64 build and the call in sandbox_policy was then not being
defined. I just implemented the function in-plcae since it's just a simple wrapper around a Windows API call.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6013009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_win.cc')
| -rw-r--r-- | chrome/browser/browser_main_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index bd5573a..7f8154e 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -12,7 +12,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_win.h" -#include "app/win_util.h" +#include "app/win/win_util.h" #include "base/command_line.h" #include "base/environment.h" #include "base/i18n/rtl.h" @@ -57,7 +57,7 @@ void WarnAboutMinimumSystemRequirements() { const std::wstring text = l10n_util::GetString(IDS_UNSUPPORTED_OS_PRE_WIN_XP); const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME); - win_util::MessageBox(NULL, text, caption, + app::win::MessageBox(NULL, text, caption, MB_OK | MB_ICONWARNING | MB_TOPMOST); } } @@ -75,7 +75,7 @@ void ShowCloseBrowserFirstMessageBox() { const std::wstring text = l10n_util::GetString(IDS_UNINSTALL_CLOSE_APP); const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME); const UINT flags = MB_OK | MB_ICONWARNING | MB_TOPMOST; - win_util::MessageBox(NULL, text, caption, flags); + app::win::MessageBox(NULL, text, caption, flags); } int DoUninstallTasks(bool chrome_still_running) { @@ -167,7 +167,7 @@ int HandleIconsCommands(const CommandLine &parsed_command_line) { cp_applet); const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME); const UINT flags = MB_OKCANCEL | MB_ICONWARNING | MB_TOPMOST; - if (IDOK == win_util::MessageBox(NULL, msg, caption, flags)) + if (IDOK == app::win::MessageBox(NULL, msg, caption, flags)) ShellExecute(NULL, NULL, L"appwiz.cpl", NULL, NULL, SW_SHOWNORMAL); return ResultCodes::NORMAL_EXIT; // Exit as we are not launching browser. } @@ -194,7 +194,7 @@ bool CheckMachineLevelInstall() { l10n_util::GetString(IDS_MACHINE_LEVEL_INSTALL_CONFLICT); const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME); const UINT flags = MB_OK | MB_ICONERROR | MB_TOPMOST; - win_util::MessageBox(NULL, text, caption, flags); + app::win::MessageBox(NULL, text, caption, flags); FilePath uninstall_path(InstallUtil::GetChromeUninstallCmd(false, dist)); CommandLine uninstall_cmd(uninstall_path); if (!uninstall_cmd.GetProgram().value().empty()) { |