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

Unified Diff: ui/base/win/shell.cc

Issue 10837222: Enable EULA dialog to be shown from metro Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bit o' spit n' polish. Created 8 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 side-by-side diff with in-line comments
Download patch
« chrome/installer/util/google_update_settings.cc ('K') | « ui/base/win/shell.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/win/shell.cc
diff --git a/ui/base/win/shell.cc b/ui/base/win/shell.cc
index f8e9d79ee1bc094cd6a61373e3d925bff7a71484..9d6412681fdee37dbf1d6dd3e6e4a1cc6e706a4d 100644
--- a/ui/base/win/shell.cc
+++ b/ui/base/win/shell.cc
@@ -58,12 +58,15 @@ bool OpenItemWithExternalApp(const string16& full_path) {
bool OpenAnyViaShell(const string16& full_path,
const string16& directory,
+ const string16& args,
DWORD mask) {
SHELLEXECUTEINFO sei = { sizeof(sei) };
sei.fMask = mask;
sei.nShow = SW_SHOWNORMAL;
sei.lpFile = full_path.c_str();
sei.lpDirectory = directory.c_str();
+ if (!args.empty())
+ sei.lpParameters = args.c_str();
if (::ShellExecuteExW(&sei))
return true;
@@ -73,12 +76,17 @@ bool OpenAnyViaShell(const string16& full_path,
}
bool OpenItemViaShell(const FilePath& full_path) {
- return OpenAnyViaShell(full_path.value(), full_path.DirName().value(), 0);
+ return OpenAnyViaShell(full_path.value(),
grt (UTC plus 2) 2012/09/20 15:58:31 chromium style suggests wrapping this more densely
robertshield 2012/09/21 01:24:43 suggests -> allows :-) but sure, done.
grt (UTC plus 2) 2012/09/21 01:35:41 true. there seems to be an overall "conserve vert
+ full_path.DirName().value(),
+ string16(),
+ 0);
}
bool OpenItemViaShellNoZoneCheck(const FilePath& full_path) {
- return OpenAnyViaShell(full_path.value(), string16(),
- SEE_MASK_NOZONECHECKS | SEE_MASK_FLAG_DDEWAIT);
+ return OpenAnyViaShell(full_path.value(),
+ string16(),
+ string16(),
+ SEE_MASK_NOZONECHECKS | SEE_MASK_FLAG_DDEWAIT);
}
void SetAppIdForWindow(const string16& app_id, HWND hwnd) {
« chrome/installer/util/google_update_settings.cc ('K') | « ui/base/win/shell.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698