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

Unified Diff: chrome/renderer/render_view.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/plugin/webplugin_proxy.cc ('k') | chrome/test/automation/automation_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 71854)
+++ chrome/renderer/render_view.cc (working copy)
@@ -10,7 +10,6 @@
#include <vector>
#include "app/l10n_util.h"
-#include "app/message_box_flags.h"
#include "app/resource_bundle.h"
#include "base/callback.h"
#include "base/command_line.h"
@@ -159,6 +158,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
#include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/message_box_flags.h"
#include "v8/include/v8.h"
#include "v8/include/v8-testing.h"
#include "webkit/appcache/web_application_cache_host_impl.h"
@@ -2385,7 +2385,7 @@
void RenderView::runModalAlertDialog(
WebFrame* frame, const WebString& message) {
- RunJavaScriptMessage(MessageBoxFlags::kIsJavascriptAlert,
+ RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptAlert,
UTF16ToWideHack(message),
std::wstring(),
frame->url(),
@@ -2394,7 +2394,7 @@
bool RenderView::runModalConfirmDialog(
WebFrame* frame, const WebString& message) {
- return RunJavaScriptMessage(MessageBoxFlags::kIsJavascriptConfirm,
+ return RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptConfirm,
UTF16ToWideHack(message),
std::wstring(),
frame->url(),
@@ -2405,7 +2405,7 @@
WebFrame* frame, const WebString& message, const WebString& default_value,
WebString* actual_value) {
std::wstring result;
- bool ok = RunJavaScriptMessage(MessageBoxFlags::kIsJavascriptPrompt,
+ bool ok = RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptPrompt,
UTF16ToWideHack(message),
UTF16ToWideHack(default_value),
frame->url(),
« no previous file with comments | « chrome/plugin/webplugin_proxy.cc ('k') | chrome/test/automation/automation_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698