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

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/automation/ui_controls_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider.cc (revision 71854)
+++ chrome/browser/automation/testing_automation_provider.cc (working copy)
@@ -4,7 +4,6 @@
#include "chrome/browser/automation/testing_automation_provider.h"
-#include "app/message_box_flags.h"
#include "base/command_line.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
@@ -75,6 +74,7 @@
#include "chrome/common/automation_messages.h"
#include "net/base/cookie_store.h"
#include "net/url_request/url_request_context.h"
+#include "ui/base/message_box_flags.h"
#include "views/event.h"
#include "webkit/plugins/npapi/plugin_list.h"
@@ -1780,7 +1780,7 @@
AppModalDialogQueue::GetInstance()->active_dialog();
if (!active_dialog) {
*showing_dialog = false;
- *dialog_button = MessageBoxFlags::DIALOGBUTTON_NONE;
+ *dialog_button = ui::MessageBoxFlags::DIALOGBUTTON_NONE;
return;
}
NativeAppModalDialog* native_dialog = active_dialog->native_dialog();
@@ -1788,7 +1788,7 @@
if (*showing_dialog)
*dialog_button = native_dialog->GetAppModalDialogButtons();
else
- *dialog_button = MessageBoxFlags::DIALOGBUTTON_NONE;
+ *dialog_button = ui::MessageBoxFlags::DIALOGBUTTON_NONE;
}
void TestingAutomationProvider::ClickAppModalDialogButton(int button,
@@ -1799,13 +1799,13 @@
AppModalDialogQueue::GetInstance()->active_dialog()->native_dialog();
if (native_dialog &&
(native_dialog->GetAppModalDialogButtons() & button) == button) {
- if ((button & MessageBoxFlags::DIALOGBUTTON_OK) ==
- MessageBoxFlags::DIALOGBUTTON_OK) {
+ if ((button & ui::MessageBoxFlags::DIALOGBUTTON_OK) ==
+ ui::MessageBoxFlags::DIALOGBUTTON_OK) {
native_dialog->AcceptAppModalDialog();
*success = true;
}
- if ((button & MessageBoxFlags::DIALOGBUTTON_CANCEL) ==
- MessageBoxFlags::DIALOGBUTTON_CANCEL) {
+ if ((button & ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) ==
+ ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) {
DCHECK(!*success) << "invalid param, OK and CANCEL specified";
native_dialog->CancelAppModalDialog();
*success = true;
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/automation/ui_controls_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698