diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 23:35:31 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 23:35:31 +0000 |
| commit | b65bdda36c548cd680eecbbfcfbd482b740e2eb3 (patch) | |
| tree | f904be7f7f8db20269dbe2c76b28e325ec04bd28 /ash/shell | |
| parent | ff00968f75fd1a82532b0009f535310db5a9556c (diff) | |
| download | chromium_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')
| -rw-r--r-- | ash/shell/example_factory.h | 2 | ||||
| -rw-r--r-- | ash/shell/lock_view.cc | 4 | ||||
| -rw-r--r-- | ash/shell/shell_main.cc | 6 | ||||
| -rw-r--r-- | ash/shell/window_type_launcher.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ash/shell/example_factory.h b/ash/shell/example_factory.h index 76e1f6e..eaea874 100644 --- a/ash/shell/example_factory.h +++ b/ash/shell/example_factory.h @@ -6,7 +6,7 @@ #define ASH_SHELL_EXAMPLE_FACTORY_H_ #pragma once -#include "ui/aura_shell/shell_delegate.h" +#include "ash/shell_delegate.h" namespace aura_shell { class AppListModel; 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" diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc index 7142406..0e5d961 100644 --- a/ash/shell/shell_main.cc +++ b/ash/shell/shell_main.cc @@ -3,6 +3,9 @@ // found in the LICENSE file. #include "ash/launcher/launcher_types.h" +#include "ash/shell.h" +#include "ash/shell_delegate.h" +#include "ash/shell_factory.h" #include "ash/shell/example_factory.h" #include "ash/shell/toplevel_window.h" #include "ash/wm/window_util.h" @@ -12,9 +15,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "ui/aura/root_window.h" -#include "ui/aura_shell/shell.h" -#include "ui/aura_shell/shell_delegate.h" -#include "ui/aura_shell/shell_factory.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "ui/gfx/canvas.h" diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 04c4667..85028ca 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -4,6 +4,7 @@ #include "ash/shell/window_type_launcher.h" +#include "ash/shell_window_ids.h" #include "ash/shell/example_factory.h" #include "ash/shell/toplevel_window.h" #include "ash/wm/shadow_types.h" @@ -11,7 +12,6 @@ #include "base/utf_string_conversions.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/aura_shell/shell_window_ids.h" #include "ui/gfx/canvas.h" #include "ui/gfx/compositor/layer.h" #include "ui/views/controls/button/text_button.h" |