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

Unified Diff: chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc

Issue 10451047: content: Move javascript_message_type.h into content/ from ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm CONTEXT_EXPORT Created 8 years, 7 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
Index: chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
index f4e610c83b4d594ddfcc157d40ef697631ed6493..2e542dc161398a16031b7d719f96f884e3135cf0 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
@@ -20,9 +20,9 @@
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
#include "content/public/common/content_client.h"
+#include "content/public/common/javascript_message_type.h"
#include "grit/generated_resources.h"
#include "net/base/net_util.h"
-#include "ui/base/javascript_message_type.h"
#include "ui/base/l10n/l10n_util.h"
using content::JavaScriptDialogCreator;
@@ -42,7 +42,7 @@ class ChromeJavaScriptDialogCreator : public JavaScriptDialogCreator,
WebContents* web_contents,
const GURL& origin_url,
const std::string& accept_lang,
- ui::JavascriptMessageType javascript_message_type,
+ content::JavaScriptMessageType message_type,
const string16& message_text,
const string16& default_prompt_text,
const DialogClosedCallback& callback,
@@ -121,7 +121,7 @@ void ChromeJavaScriptDialogCreator::RunJavaScriptDialog(
WebContents* web_contents,
const GURL& origin_url,
const std::string& accept_lang,
- ui::JavascriptMessageType javascript_message_type,
+ content::JavaScriptMessageType message_type,
const string16& message_text,
const string16& default_prompt_text,
const DialogClosedCallback& callback,
@@ -147,7 +147,7 @@ void ChromeJavaScriptDialogCreator::RunJavaScriptDialog(
display_suppress_checkbox = true;
}
- bool is_alert = javascript_message_type == ui::JAVASCRIPT_MESSAGE_TYPE_ALERT;
+ bool is_alert = message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
string16 dialog_title = GetTitle(origin_url, accept_lang, is_alert);
if (extension_host_)
@@ -157,7 +157,7 @@ void ChromeJavaScriptDialogCreator::RunJavaScriptDialog(
web_contents,
extra_data,
dialog_title,
- javascript_message_type,
+ message_type,
message_text,
default_prompt_text,
display_suppress_checkbox,
@@ -189,7 +189,7 @@ void ChromeJavaScriptDialogCreator::RunBeforeUnloadDialog(
web_contents,
extra_data,
title,
- ui::JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
+ content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
full_message,
string16(), // default_prompt_text
false, // display_suppress_checkbox

Powered by Google App Engine
This is Rietveld 408576698