Move a bunch of random other files to src/ui/base...

chrome/browser/ui/views/external_protocol_dialog.cc

Index: chrome/browser/ui/views/external_protocol_dialog.cc
===================================================================
--- chrome/browser/ui/views/external_protocol_dialog.cc	(revision 71854)
+++ chrome/browser/ui/views/external_protocol_dialog.cc	(working copy)
@@ -5,8 +5,6 @@
 #include "chrome/browser/ui/views/external_protocol_dialog.h"
 
 #include "app/l10n_util.h"
-#include "app/message_box_flags.h"
-#include "app/text_elider.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
@@ -18,6 +16,8 @@
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "ui/base/message_box_flags.h"
+#include "ui/base/text/text_elider.h"
 #include "views/controls/message_box_view.h"
 #include "views/window/window.h"
 
@@ -56,12 +56,12 @@
 // ExternalProtocolDialog, views::DialogDelegate implementation:
 
 int ExternalProtocolDialog::GetDefaultDialogButton() const {
-  return MessageBoxFlags::DIALOGBUTTON_CANCEL;
+  return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL;
 }
 
 std::wstring ExternalProtocolDialog::GetDialogButtonLabel(
-    MessageBoxFlags::DialogButton button) const {
-  if (button == MessageBoxFlags::DIALOGBUTTON_OK)
+    ui::MessageBoxFlags::DialogButton button) const {
+  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK)
     return UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT));
   else
@@ -125,9 +125,9 @@
   const int kMaxCommandSize = 256;
   std::wstring elided_url_without_scheme;
   std::wstring elided_command;
-  gfx::ElideString(ASCIIToWide(url.possibly_invalid_spec()),
-                   kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
-  gfx::ElideString(command, kMaxCommandSize, &elided_command);
+  ui::ElideString(ASCIIToWide(url.possibly_invalid_spec()),
+                  kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
+  ui::ElideString(command, kMaxCommandSize, &elided_command);
 
   std::wstring message_text = UTF16ToWide(l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_INFORMATION,
@@ -141,10 +141,11 @@
   message_text +=
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_WARNING));
 
-  message_box_view_ = new MessageBoxView(MessageBoxFlags::kIsConfirmMessageBox,
-                                         message_text,
-                                         std::wstring(),
-                                         kMessageWidth);
+  message_box_view_ = new MessageBoxView(
+      ui::MessageBoxFlags::kIsConfirmMessageBox,
+      message_text,
+      std::wstring(),
+      kMessageWidth);
   message_box_view_->SetCheckBoxLabel(UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT)));