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

Side by Side Diff: ash/shell.cc

Issue 1528963002: Quirks Client for downloading and providing display profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove hacks for clean, but non-working, draft Created 4 years, 11 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 (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 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 display_error_observer_.reset(new DisplayErrorObserver()); 859 display_error_observer_.reset(new DisplayErrorObserver());
860 display_configurator_->AddObserver(display_error_observer_.get()); 860 display_configurator_->AddObserver(display_error_observer_.get());
861 display_configurator_->set_state_controller(display_change_observer_.get()); 861 display_configurator_->set_state_controller(display_change_observer_.get());
862 display_configurator_->set_mirroring_controller(display_manager_.get()); 862 display_configurator_->set_mirroring_controller(display_manager_.get());
863 display_configurator_->ForceInitialConfigure( 863 display_configurator_->ForceInitialConfigure(
864 delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0); 864 delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0);
865 display_initialized = true; 865 display_initialized = true;
866 } 866 }
867 display_color_manager_.reset( 867 display_color_manager_.reset(
868 new DisplayColorManager(display_configurator_.get(), blocking_pool_)); 868 new DisplayColorManager(display_configurator_.get(), blocking_pool_));
869
870 // TODO: Delete! (Only here for testing)
871 display_color_manager_->LoadCalibrationForDisplayQuirksTest();
Greg Levin 2016/01/12 17:13:55 This line launches the Quirks Client for testing f
869 #endif // defined(OS_CHROMEOS) 872 #endif // defined(OS_CHROMEOS)
870 if (!display_initialized) 873 if (!display_initialized)
871 display_manager_->InitDefaultDisplay(); 874 display_manager_->InitDefaultDisplay();
872 875
873 display_manager_->RefreshFontParams(); 876 display_manager_->RefreshFontParams();
874 877
875 // Install the custom factory first so that views::FocusManagers for Tray, 878 // Install the custom factory first so that views::FocusManagers for Tray,
876 // Shelf, and WallPaper could be created by the factory. 879 // Shelf, and WallPaper could be created by the factory.
877 views::FocusManagerFactory::Install(new AshFocusManagerFactory); 880 views::FocusManagerFactory::Install(new AshFocusManagerFactory);
878 881
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 1172
1170 void Shell::OnWindowActivated( 1173 void Shell::OnWindowActivated(
1171 aura::client::ActivationChangeObserver::ActivationReason reason, 1174 aura::client::ActivationChangeObserver::ActivationReason reason,
1172 aura::Window* gained_active, 1175 aura::Window* gained_active,
1173 aura::Window* lost_active) { 1176 aura::Window* lost_active) {
1174 if (gained_active) 1177 if (gained_active)
1175 target_root_window_ = gained_active->GetRootWindow(); 1178 target_root_window_ = gained_active->GetRootWindow();
1176 } 1179 }
1177 1180
1178 } // namespace ash 1181 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698