| 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_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ |    5 #ifndef UI_DISPLAY_MANAGER_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ | 
|    6 #define UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ |    6 #define UI_DISPLAY_MANAGER_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_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 "base/memory/weak_ptr.h" |   13 #include "base/memory/weak_ptr.h" | 
|   14 #include "ui/display/chromeos/configure_displays_task.h" |   14 #include "ui/display/manager/chromeos/configure_displays_task.h" | 
|   15 #include "ui/display/chromeos/display_configurator.h" |   15 #include "ui/display/manager/chromeos/display_configurator.h" | 
|   16  |   16  | 
|   17 namespace ui { |   17 namespace ui { | 
|   18  |   18  | 
|   19 class DisplaySnapshot; |   19 class DisplaySnapshot; | 
|   20 class NativeDisplayDelegate; |   20 class NativeDisplayDelegate; | 
|   21  |   21  | 
|   22 class DISPLAY_EXPORT UpdateDisplayConfigurationTask { |   22 class DISPLAY_MANAGER_EXPORT UpdateDisplayConfigurationTask { | 
|   23  public: |   23  public: | 
|   24   typedef base::Callback<void( |   24   typedef base::Callback<void( | 
|   25       bool /* success */, |   25       bool /* success */, | 
|   26       const std::vector<DisplaySnapshot*>& /* displays */, |   26       const std::vector<DisplaySnapshot*>& /* displays */, | 
|   27       const gfx::Size& /* framebuffer_size */, |   27       const gfx::Size& /* framebuffer_size */, | 
|   28       MultipleDisplayState /* new_display_state */, |   28       MultipleDisplayState /* new_display_state */, | 
|   29       chromeos::DisplayPowerState /* new_power_state */)> ResponseCallback; |   29       chromeos::DisplayPowerState /* new_power_state */)> | 
 |   30       ResponseCallback; | 
|   30  |   31  | 
|   31   UpdateDisplayConfigurationTask(NativeDisplayDelegate* delegate, |   32   UpdateDisplayConfigurationTask(NativeDisplayDelegate* delegate, | 
|   32                                  DisplayLayoutManager* layout_manager, |   33                                  DisplayLayoutManager* layout_manager, | 
|   33                                  MultipleDisplayState new_display_state, |   34                                  MultipleDisplayState new_display_state, | 
|   34                                  chromeos::DisplayPowerState new_power_state, |   35                                  chromeos::DisplayPowerState new_power_state, | 
|   35                                  int power_flags, |   36                                  int power_flags, | 
|   36                                  uint32_t background_color_argb, |   37                                  uint32_t background_color_argb, | 
|   37                                  bool force_configure, |   38                                  bool force_configure, | 
|   38                                  const ResponseCallback& callback); |   39                                  const ResponseCallback& callback); | 
|   39   ~UpdateDisplayConfigurationTask(); |   40   ~UpdateDisplayConfigurationTask(); | 
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  108  |  109  | 
|  109   std::unique_ptr<ConfigureDisplaysTask> configure_task_; |  110   std::unique_ptr<ConfigureDisplaysTask> configure_task_; | 
|  110  |  111  | 
|  111   base::WeakPtrFactory<UpdateDisplayConfigurationTask> weak_ptr_factory_; |  112   base::WeakPtrFactory<UpdateDisplayConfigurationTask> weak_ptr_factory_; | 
|  112  |  113  | 
|  113   DISALLOW_COPY_AND_ASSIGN(UpdateDisplayConfigurationTask); |  114   DISALLOW_COPY_AND_ASSIGN(UpdateDisplayConfigurationTask); | 
|  114 }; |  115 }; | 
|  115  |  116  | 
|  116 }  // namespace ui |  117 }  // namespace ui | 
|  117  |  118  | 
|  118 #endif  // UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ |  119 #endif  // UI_DISPLAY_MANAGER_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ | 
| OLD | NEW |