| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "ash/test/ash_test_base.h" | 6 #include "ash/test/ash_test_base.h" |
| 7 #include "ash/test/test_session_state_delegate.h" | 7 #include "ash/test/test_session_state_delegate.h" |
| 8 #include "ash/test/test_shell_delegate.h" | 8 #include "ash/test/test_shell_delegate.h" |
| 9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h" | 12 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h" |
| 13 #include "chrome/browser/chromeos/login/fake_user_manager.h" | 13 #include "chrome/browser/chromeos/login/fake_user_manager.h" |
| 14 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 14 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
| 15 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" | 15 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" |
| 16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 17 #include "ui/aura/test/test_windows.h" | 17 #include "ui/aura/test/test_windows.h" |
| 18 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
| 19 #include "ui/aura/window_event_dispatcher.h" | 19 #include "ui/aura/window_event_dispatcher.h" |
| 20 | 20 |
| 21 //#include "base/compiler_specific.h" | 21 //#include "base/compiler_specific.h" |
| 22 //#include "base/logging.h" | 22 //#include "base/logging.h" |
| 23 //#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 23 //#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
| 24 namespace chromeos { | 24 namespace chromeos { |
| 25 namespace { | 25 namespace { |
error: old chunk mismatch |
None
| OLD | NEW |