content: Move javascript_message_type.h into content/ from ui/.

chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
 
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/singleton.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_observer.h"
 #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;
 using content::WebContents;
 
 namespace {
 
 class ChromeJavaScriptDialogCreator : public JavaScriptDialogCreator,
                                       public content::NotificationObserver {
  public:
   static ChromeJavaScriptDialogCreator* GetInstance();
 
   explicit ChromeJavaScriptDialogCreator(ExtensionHost* extension_host);
   virtual ~ChromeJavaScriptDialogCreator();
 
   virtual void 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,
       bool* did_suppress_message) OVERRIDE;
 
   virtual void RunBeforeUnloadDialog(
       WebContents* web_contents,
       const string16& message_text,
       bool is_reload,
       const DialogClosedCallback& callback) OVERRIDE;
@@ skipping 58 matching lines @@
 
 // static
 ChromeJavaScriptDialogCreator* ChromeJavaScriptDialogCreator::GetInstance() {
   return Singleton<ChromeJavaScriptDialogCreator>::get();
 }
 
 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,
     bool* did_suppress_message)  {
   *did_suppress_message = false;
 
   ChromeJavaScriptDialogExtraData* extra_data =
       &javascript_dialog_extra_data_[web_contents];
 
   if (extra_data->suppress_javascript_messages_) {
     *did_suppress_message = true;
     return;
   }
 
   base::TimeDelta time_since_last_message = base::TimeTicks::Now() -
       extra_data->last_javascript_message_dismissal_;
   bool display_suppress_checkbox = false;
   // Show a checkbox offering to suppress further messages if this message is
   // being displayed within kJavascriptMessageExpectedDelay of the last one.
   if (time_since_last_message <
       base::TimeDelta::FromMilliseconds(
           chrome::kJavascriptMessageExpectedDelay)) {
     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_)
     extension_host_->WillRunJavaScriptDialog();
 
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       web_contents,
       extra_data,
       dialog_title,
-      javascript_message_type,
+      message_type,
       message_text,
       default_prompt_text,
       display_suppress_checkbox,
       false,  // is_before_unload_dialog
       false,  // is_reload
       base::Bind(&ChromeJavaScriptDialogCreator::OnDialogClosed,
                  base::Unretained(this), callback)));
 }
 
 void ChromeJavaScriptDialogCreator::RunBeforeUnloadDialog(
@@ skipping 11 matching lines @@
 
   string16 full_message = message_text + ASCIIToUTF16("\n\n") + footer;
 
   if (extension_host_)
     extension_host_->WillRunJavaScriptDialog();
 
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       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
       true,        // is_before_unload_dialog
       is_reload,
       base::Bind(&ChromeJavaScriptDialogCreator::OnDialogClosed,
                  base::Unretained(this), callback)));
 }
 
 void ChromeJavaScriptDialogCreator::ResetJavaScriptState(
@@ skipping 64 matching lines @@
 }  // namespace
 
 content::JavaScriptDialogCreator* GetJavaScriptDialogCreatorInstance() {
   return ChromeJavaScriptDialogCreator::GetInstance();
 }
 
 content::JavaScriptDialogCreator* CreateJavaScriptDialogCreatorInstance(
     ExtensionHost* extension_host) {
   return new ChromeJavaScriptDialogCreator(extension_host);
 }