| 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_CONFIGURATION_TASK_H_ |   5 #ifndef UI_DISPLAY_MANAGER_CHROMEOS_CONFIGURE_DISPLAYS_TASK_H_ | 
|   6 #define UI_DISPLAY_CHROMEOS_CONFIGURATION_TASK_H_ |   6 #define UI_DISPLAY_MANAGER_CHROMEOS_CONFIGURE_DISPLAYS_TASK_H_ | 
|   7  |   7  | 
|   8 #include <stddef.h> |   8 #include <stddef.h> | 
|   9  |   9  | 
|  10 #include <queue> |  10 #include <queue> | 
|  11 #include <vector> |  11 #include <vector> | 
|  12  |  12  | 
|  13 #include "base/callback.h" |  13 #include "base/callback.h" | 
|  14 #include "base/macros.h" |  14 #include "base/macros.h" | 
|  15 #include "base/memory/weak_ptr.h" |  15 #include "base/memory/weak_ptr.h" | 
|  16 #include "ui/display/display_export.h" |  16 #include "ui/display/manager/display_manager_export.h" | 
|  17 #include "ui/gfx/geometry/point.h" |  17 #include "ui/gfx/geometry/point.h" | 
|  18  |  18  | 
|  19 namespace ui { |  19 namespace ui { | 
|  20  |  20  | 
|  21 class DisplayMode; |  21 class DisplayMode; | 
|  22 class DisplaySnapshot; |  22 class DisplaySnapshot; | 
|  23 class NativeDisplayDelegate; |  23 class NativeDisplayDelegate; | 
|  24  |  24  | 
|  25 struct DISPLAY_EXPORT DisplayConfigureRequest { |  25 struct DISPLAY_MANAGER_EXPORT DisplayConfigureRequest { | 
|  26   DisplayConfigureRequest(DisplaySnapshot* display, |  26   DisplayConfigureRequest(DisplaySnapshot* display, | 
|  27                           const DisplayMode* mode, |  27                           const DisplayMode* mode, | 
|  28                           const gfx::Point& origin); |  28                           const gfx::Point& origin); | 
|  29  |  29  | 
|  30   DisplaySnapshot* display; |  30   DisplaySnapshot* display; | 
|  31   const DisplayMode* mode; |  31   const DisplayMode* mode; | 
|  32   gfx::Point origin; |  32   gfx::Point origin; | 
|  33 }; |  33 }; | 
|  34  |  34  | 
|  35 // Applies the display configuration asynchronously. |  35 // Applies the display configuration asynchronously. | 
|  36 class DISPLAY_EXPORT ConfigureDisplaysTask { |  36 class DISPLAY_MANAGER_EXPORT ConfigureDisplaysTask { | 
|  37  public: |  37  public: | 
|  38   enum Status { |  38   enum Status { | 
|  39     // At least one of the displays failed to apply any mode it supports. |  39     // At least one of the displays failed to apply any mode it supports. | 
|  40     ERROR, |  40     ERROR, | 
|  41  |  41  | 
|  42     // The requested configuration was applied. |  42     // The requested configuration was applied. | 
|  43     SUCCESS, |  43     SUCCESS, | 
|  44  |  44  | 
|  45     // At least one of the displays failed to apply the requested |  45     // At least one of the displays failed to apply the requested | 
|  46     // configuration, but it managed to fall back to another mode. |  46     // configuration, but it managed to fall back to another mode. | 
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  81  |  81  | 
|  82   Status task_status_; |  82   Status task_status_; | 
|  83  |  83  | 
|  84   base::WeakPtrFactory<ConfigureDisplaysTask> weak_ptr_factory_; |  84   base::WeakPtrFactory<ConfigureDisplaysTask> weak_ptr_factory_; | 
|  85  |  85  | 
|  86   DISALLOW_COPY_AND_ASSIGN(ConfigureDisplaysTask); |  86   DISALLOW_COPY_AND_ASSIGN(ConfigureDisplaysTask); | 
|  87 }; |  87 }; | 
|  88  |  88  | 
|  89 }  // namespace ui |  89 }  // namespace ui | 
|  90  |  90  | 
|  91 #endif  // UI_DISPLAY_CHROMEOS_CONFIGURATION_TASK_H_ |  91 #endif  // UI_DISPLAY_MANAGER_CHROMEOS_CONFIGURE_DISPLAYS_TASK_H_ | 
| OLD | NEW |