summaryrefslogtreecommitdiffstats
path: root/ash/shell/lock_view.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-23 23:35:31 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-23 23:35:31 +0000
commitb65bdda36c548cd680eecbbfcfbd482b740e2eb3 (patch)
treef904be7f7f8db20269dbe2c76b28e325ec04bd28 /ash/shell/lock_view.cc
parentff00968f75fd1a82532b0009f535310db5a9556c (diff)
downloadchromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.zip
chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.gz
chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.bz2
Move last few files -> ash
http://crbug.com/108457 TEST=none TBR=sky Review URL: http://codereview.chromium.org/9036011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/lock_view.cc')
-rw-r--r--ash/shell/lock_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc
index 641734f..739649a 100644
--- a/ash/shell/lock_view.cc
+++ b/ash/shell/lock_view.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/shell.h"
+#include "ash/shell_window_ids.h"
#include "ash/shell/example_factory.h"
#include "base/utf_string_conversions.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/shell_window_ids.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font.h"
#include "ui/views/widget/widget.h"