summaryrefslogtreecommitdiffstats
path: root/win8/test
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-14 20:36:42 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-14 20:36:42 +0000
commitf768487e30cf72a7c23606512926e94efff58fc9 (patch)
tree5458b75b27c12deff59cdef166162b853c592b70 /win8/test
parentf480fbad402552df6bd2618043ae029a0f85aec0 (diff)
downloadchromium_src-f768487e30cf72a7c23606512926e94efff58fc9.zip
chromium_src-f768487e30cf72a7c23606512926e94efff58fc9.tar.gz
chromium_src-f768487e30cf72a7c23606512926e94efff58fc9.tar.bz2
Clarify that OpenWithDialogController will fail if asked to make a program default when it is already default.
BUG=None NOTRY=True Review URL: https://chromiumcodereview.appspot.com/14932011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200060 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/test')
-rw-r--r--win8/test/open_with_dialog_controller.h3
-rw-r--r--win8/test/ui_automation_client.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/win8/test/open_with_dialog_controller.h b/win8/test/open_with_dialog_controller.h
index 8c664fc..55dd149 100644
--- a/win8/test/open_with_dialog_controller.h
+++ b/win8/test/open_with_dialog_controller.h
@@ -34,6 +34,9 @@ class OpenWithDialogController {
// |url_protocol|. |parent_window| may be NULL. |callback| will be invoked
// upon completion. This instance may be deleted prior to |callback| being
// invoked to cancel the operation.
+ // Note: This will fail if |program| is already default for |url_protocol|
+ // since |program| will not show up verbatim in the dialog (e.g., in EN-US, it
+ // will be prefixed by "Keep using ").
void Begin(HWND parent_window,
const string16& url_protocol,
const string16& program,
diff --git a/win8/test/ui_automation_client.cc b/win8/test/ui_automation_client.cc
index fff2828..8c866308 100644
--- a/win8/test/ui_automation_client.cc
+++ b/win8/test/ui_automation_client.cc
@@ -437,7 +437,7 @@ HRESULT UIAutomationClient::Context::InvokeDesiredItem(
// If the item was found, invoke it.
if (!target.get()) {
- LOG(ERROR) << "Failed to find desired item to invoke.";
+ LOG(WARNING) << "Failed to find desired item to invoke.";
return E_FAIL;
}