| OLD | NEW | 
|    1 // Copyright 2014 The Chromium Authors. All rights reserved. |    1 // Copyright 2014 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 #ifndef UI_DISPLAY_CHROMEOS_TEST_TEST_NATIVE_DISPLAY_DELEGATE_H_ |    5 #ifndef UI_DISPLAY_MANAGER_CHROMEOS_TEST_TEST_NATIVE_DISPLAY_DELEGATE_H_ | 
|    6 #define UI_DISPLAY_CHROMEOS_TEST_TEST_NATIVE_DISPLAY_DELEGATE_H_ |    6 #define UI_DISPLAY_MANAGER_CHROMEOS_TEST_TEST_NATIVE_DISPLAY_DELEGATE_H_ | 
|    7  |    7  | 
|    8 #include <stdint.h> |    8 #include <stdint.h> | 
|    9  |    9  | 
|   10 #include <vector> |   10 #include <vector> | 
|   11  |   11  | 
|   12 #include "base/macros.h" |   12 #include "base/macros.h" | 
|   13 #include "ui/display/chromeos/test/action_logger.h" |   13 #include "ui/display/manager/chromeos/test/action_logger.h" | 
|   14 #include "ui/display/chromeos/test/action_logger_util.h" |   14 #include "ui/display/manager/chromeos/test/action_logger_util.h" | 
|   15 #include "ui/display/types/native_display_delegate.h" |   15 #include "ui/display/types/native_display_delegate.h" | 
|   16  |   16  | 
|   17 namespace ui { |   17 namespace ui { | 
|   18  |   18  | 
|   19 class ActionLogger; |   19 class ActionLogger; | 
|   20 class DisplaySnapshot; |   20 class DisplaySnapshot; | 
|   21  |   21  | 
|   22 namespace test { |   22 namespace test { | 
|   23  |   23  | 
|   24 class TestNativeDisplayDelegate : public NativeDisplayDelegate { |   24 class TestNativeDisplayDelegate : public NativeDisplayDelegate { | 
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  110   bool run_async_; |  110   bool run_async_; | 
|  111  |  111  | 
|  112   ActionLogger* log_;  // Not owned. |  112   ActionLogger* log_;  // Not owned. | 
|  113  |  113  | 
|  114   DISALLOW_COPY_AND_ASSIGN(TestNativeDisplayDelegate); |  114   DISALLOW_COPY_AND_ASSIGN(TestNativeDisplayDelegate); | 
|  115 }; |  115 }; | 
|  116  |  116  | 
|  117 }  // namespace test |  117 }  // namespace test | 
|  118 }  // namespace ui |  118 }  // namespace ui | 
|  119  |  119  | 
|  120 #endif  // UI_DISPLAY_CHROMEOS_TEST_TEST_NATIVE_DISPLAY_DELEGATE_H_ |  120 #endif  // UI_DISPLAY_MANAGER_CHROMEOS_TEST_TEST_NATIVE_DISPLAY_DELEGATE_H_ | 
| OLD | NEW |