Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: chrome/browser/chromeos/policy/display_rotation_default_handler.cc

Issue 1967773004: Fix include path for moved thread_task_runner_handle.h header in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393013 Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/chromeos/policy/display_rotation_default_handler.h" 5 #include "chrome/browser/chromeos/policy/display_rotation_default_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/single_thread_task_runner.h" 16 #include "base/single_thread_task_runner.h"
17 #include "base/thread_task_runner_handle.h" 17 #include "base/threading/thread_task_runner_handle.h"
18 #include "chromeos/settings/cros_settings_names.h" 18 #include "chromeos/settings/cros_settings_names.h"
19 19
20 namespace policy { 20 namespace policy {
21 21
22 DisplayRotationDefaultHandler::DisplayRotationDefaultHandler() { 22 DisplayRotationDefaultHandler::DisplayRotationDefaultHandler() {
23 ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); 23 ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
24 ash::Shell::GetInstance()->AddShellObserver(this); 24 ash::Shell::GetInstance()->AddShellObserver(this);
25 settings_observer_ = chromeos::CrosSettings::Get()->AddSettingsObserver( 25 settings_observer_ = chromeos::CrosSettings::Get()->AddSettingsObserver(
26 chromeos::kDisplayRotationDefault, 26 chromeos::kDisplayRotationDefault,
27 base::Bind(&DisplayRotationDefaultHandler::OnCrosSettingsChanged, 27 base::Bind(&DisplayRotationDefaultHandler::OnCrosSettingsChanged,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 (new_policy_enabled && 102 (new_policy_enabled &&
103 new_display_rotation_default != display_rotation_default_)) { 103 new_display_rotation_default != display_rotation_default_)) {
104 policy_enabled_ = new_policy_enabled; 104 policy_enabled_ = new_policy_enabled;
105 display_rotation_default_ = new_display_rotation_default; 105 display_rotation_default_ = new_display_rotation_default;
106 return true; 106 return true;
107 } 107 }
108 return false; 108 return false;
109 } 109 }
110 110
111 } // namespace policy 111 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698