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

Side by Side Diff: ash/shell.cc

Issue 2585633004: ozone: Allow ozone evdev/kvm features to be enabled without running on ChromeOS. (Closed)
Patch Set: fix bad rebase Created 4 years 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 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 #endif 609 #endif
610 610
611 // The DBusThreadManager must outlive this Shell. See the DCHECK in ~Shell. 611 // The DBusThreadManager must outlive this Shell. See the DCHECK in ~Shell.
612 chromeos::DBusThreadManager* dbus_thread_manager = 612 chromeos::DBusThreadManager* dbus_thread_manager =
613 chromeos::DBusThreadManager::Get(); 613 chromeos::DBusThreadManager::Get();
614 projecting_observer_.reset( 614 projecting_observer_.reset(
615 new ProjectingObserver(dbus_thread_manager->GetPowerManagerClient())); 615 new ProjectingObserver(dbus_thread_manager->GetPowerManagerClient()));
616 display_configurator_->AddObserver(projecting_observer_.get()); 616 display_configurator_->AddObserver(projecting_observer_.get());
617 wm_shell_->AddShellObserver(projecting_observer_.get()); 617 wm_shell_->AddShellObserver(projecting_observer_.get());
618 618
619 if (!display_initialized && base::SysInfo::IsRunningOnChromeOS()) { 619 if (!display_initialized && base::SysInfo::IsRunningAsSystemCompositor()) {
rjkroege 2017/01/02 01:26:27 does this risk breaking support for ChromeOS Chrom
reveman 2017/01/02 07:11:32 ChromeOS Chrome on X11 should still work just fine
620 display_change_observer_ = base::MakeUnique<display::DisplayChangeObserver>( 620 display_change_observer_ = base::MakeUnique<display::DisplayChangeObserver>(
621 display_configurator_.get(), display_manager_.get()); 621 display_configurator_.get(), display_manager_.get());
622 622
623 shutdown_observer_ = 623 shutdown_observer_ =
624 base::MakeUnique<ShutdownObserver>(display_configurator_.get()); 624 base::MakeUnique<ShutdownObserver>(display_configurator_.get());
625 625
626 // Register |display_change_observer_| first so that the rest of 626 // Register |display_change_observer_| first so that the rest of
627 // observer gets invoked after the root windows are configured. 627 // observer gets invoked after the root windows are configured.
628 display_configurator_->AddObserver(display_change_observer_.get()); 628 display_configurator_->AddObserver(display_change_observer_.get());
629 display_error_observer_.reset(new DisplayErrorObserver()); 629 display_error_observer_.reset(new DisplayErrorObserver());
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 908 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
909 return std::unique_ptr<ui::EventTargetIterator>(); 909 return std::unique_ptr<ui::EventTargetIterator>();
910 } 910 }
911 911
912 ui::EventTargeter* Shell::GetEventTargeter() { 912 ui::EventTargeter* Shell::GetEventTargeter() {
913 NOTREACHED(); 913 NOTREACHED();
914 return nullptr; 914 return nullptr;
915 } 915 }
916 916
917 } // namespace ash 917 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698