summaryrefslogtreecommitdiffstats
path: root/ash/keyboard_overlay
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 18:37:07 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 18:37:07 +0000
commita4ea1f1bb8965f37be0d9fcb39796096fd178a30 (patch)
treeec470c0361e3e410c6414835ef26012494053b07 /ash/keyboard_overlay
parent0aa509bb2ca4811b2f10b197c4f17c0f19b50980 (diff)
downloadchromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.zip
chromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.tar.gz
chromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.tar.bz2
Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/.
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/15735027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/keyboard_overlay')
-rw-r--r--ash/keyboard_overlay/keyboard_overlay_delegate.cc2
-rw-r--r--ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc2
-rw-r--r--ash/keyboard_overlay/keyboard_overlay_view.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate.cc b/ash/keyboard_overlay/keyboard_overlay_delegate.cc
index b3a925b..681efaf 100644
--- a/ash/keyboard_overlay/keyboard_overlay_delegate.cc
+++ b/ash/keyboard_overlay/keyboard_overlay_delegate.cc
@@ -9,7 +9,7 @@
#include "ash/shell.h"
#include "base/bind.h"
#include "base/memory/weak_ptr.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_message_handler.h"
diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc b/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
index c0c3825..d7058f6 100644
--- a/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
+++ b/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
@@ -6,7 +6,7 @@
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "ui/aura/window.h"
#include "ui/gfx/display.h"
#include "ui/gfx/screen.h"
diff --git a/ash/keyboard_overlay/keyboard_overlay_view.cc b/ash/keyboard_overlay/keyboard_overlay_view.cc
index 82c8091..2144caa 100644
--- a/ash/keyboard_overlay/keyboard_overlay_view.cc
+++ b/ash/keyboard_overlay/keyboard_overlay_view.cc
@@ -6,7 +6,7 @@
#include "ash/keyboard_overlay/keyboard_overlay_delegate.h"
#include "ash/shell.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/browser_context.h"
#include "grit/ash_strings.h"
#include "ui/base/events/event.h"