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

Side by Side Diff: ash/shell.cc

Issue 2437393002: Remove ash::ShellDelegate::IsFirstRunAfterBoot method (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "ash/wm/resize_shadow_controller.h" 70 #include "ash/wm/resize_shadow_controller.h"
71 #include "ash/wm/screen_pinning_controller.h" 71 #include "ash/wm/screen_pinning_controller.h"
72 #include "ash/wm/system_gesture_event_filter.h" 72 #include "ash/wm/system_gesture_event_filter.h"
73 #include "ash/wm/system_modal_container_event_filter.h" 73 #include "ash/wm/system_modal_container_event_filter.h"
74 #include "ash/wm/toplevel_window_event_handler.h" 74 #include "ash/wm/toplevel_window_event_handler.h"
75 #include "ash/wm/video_detector.h" 75 #include "ash/wm/video_detector.h"
76 #include "ash/wm/window_animations.h" 76 #include "ash/wm/window_animations.h"
77 #include "ash/wm/window_properties.h" 77 #include "ash/wm/window_properties.h"
78 #include "ash/wm/window_util.h" 78 #include "ash/wm/window_util.h"
79 #include "base/bind.h" 79 #include "base/bind.h"
80 #include "base/command_line.h"
80 #include "base/memory/ptr_util.h" 81 #include "base/memory/ptr_util.h"
81 #include "base/trace_event/trace_event.h" 82 #include "base/trace_event/trace_event.h"
82 #include "ui/aura/client/aura_constants.h" 83 #include "ui/aura/client/aura_constants.h"
83 #include "ui/aura/env.h" 84 #include "ui/aura/env.h"
84 #include "ui/aura/layout_manager.h" 85 #include "ui/aura/layout_manager.h"
85 #include "ui/aura/window.h" 86 #include "ui/aura/window.h"
86 #include "ui/aura/window_event_dispatcher.h" 87 #include "ui/aura/window_event_dispatcher.h"
87 #include "ui/base/ui_base_switches.h" 88 #include "ui/base/ui_base_switches.h"
88 #include "ui/base/user_activity/user_activity_detector.h" 89 #include "ui/base/user_activity/user_activity_detector.h"
89 #include "ui/compositor/layer.h" 90 #include "ui/compositor/layer.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 #include "ash/display/resolution_notification_controller.h" 125 #include "ash/display/resolution_notification_controller.h"
125 #include "ash/display/screen_orientation_controller_chromeos.h" 126 #include "ash/display/screen_orientation_controller_chromeos.h"
126 #include "ash/sticky_keys/sticky_keys_controller.h" 127 #include "ash/sticky_keys/sticky_keys_controller.h"
127 #include "ash/system/chromeos/power/power_event_observer.h" 128 #include "ash/system/chromeos/power/power_event_observer.h"
128 #include "ash/system/chromeos/power/video_activity_notifier.h" 129 #include "ash/system/chromeos/power/video_activity_notifier.h"
129 #include "ash/touch/touch_transformer_controller.h" 130 #include "ash/touch/touch_transformer_controller.h"
130 #include "ash/virtual_keyboard_controller.h" 131 #include "ash/virtual_keyboard_controller.h"
131 #include "base/bind_helpers.h" 132 #include "base/bind_helpers.h"
132 #include "base/sys_info.h" 133 #include "base/sys_info.h"
133 #include "chromeos/audio/audio_a11y_controller.h" 134 #include "chromeos/audio/audio_a11y_controller.h"
135 #include "chromeos/chromeos_switches.h"
134 #include "chromeos/dbus/dbus_thread_manager.h" 136 #include "chromeos/dbus/dbus_thread_manager.h"
135 #include "ui/chromeos/user_activity_power_manager_notifier.h" 137 #include "ui/chromeos/user_activity_power_manager_notifier.h"
136 #include "ui/display/chromeos/display_configurator.h" 138 #include "ui/display/chromeos/display_configurator.h"
137 139
138 #if defined(USE_X11) 140 #if defined(USE_X11)
139 #include "ui/display/chromeos/x11/native_display_delegate_x11.h" 141 #include "ui/display/chromeos/x11/native_display_delegate_x11.h"
140 #endif 142 #endif
141 143
142 #if defined(USE_OZONE) 144 #if defined(USE_OZONE)
143 #include "ui/display/types/native_display_delegate.h" 145 #include "ui/display/types/native_display_delegate.h"
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 if (!display_initialized && base::SysInfo::IsRunningOnChromeOS()) { 624 if (!display_initialized && base::SysInfo::IsRunningOnChromeOS()) {
623 display_change_observer_.reset(new DisplayChangeObserver); 625 display_change_observer_.reset(new DisplayChangeObserver);
624 // Register |display_change_observer_| first so that the rest of 626 // Register |display_change_observer_| first so that the rest of
625 // observer gets invoked after the root windows are configured. 627 // observer gets invoked after the root windows are configured.
626 display_configurator_->AddObserver(display_change_observer_.get()); 628 display_configurator_->AddObserver(display_change_observer_.get());
627 display_error_observer_.reset(new DisplayErrorObserver()); 629 display_error_observer_.reset(new DisplayErrorObserver());
628 display_configurator_->AddObserver(display_error_observer_.get()); 630 display_configurator_->AddObserver(display_error_observer_.get());
629 display_configurator_->set_state_controller(display_change_observer_.get()); 631 display_configurator_->set_state_controller(display_change_observer_.get());
630 display_configurator_->set_mirroring_controller(display_manager_.get()); 632 display_configurator_->set_mirroring_controller(display_manager_.get());
631 display_configurator_->ForceInitialConfigure( 633 display_configurator_->ForceInitialConfigure(
632 wm_shell_->delegate()->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0); 634 base::CommandLine::ForCurrentProcess()->HasSwitch(
635 chromeos::switches::kFirstExecAfterBoot)
636 ? kChromeOsBootColor
637 : 0);
633 display_initialized = true; 638 display_initialized = true;
634 } 639 }
635 display_color_manager_.reset(new DisplayColorManager( 640 display_color_manager_.reset(new DisplayColorManager(
636 display_configurator_.get(), init_params.blocking_pool)); 641 display_configurator_.get(), init_params.blocking_pool));
637 #endif // defined(OS_CHROMEOS) 642 #endif // defined(OS_CHROMEOS)
638 643
639 if (!display_initialized) 644 if (!display_initialized)
640 display_manager_->InitDefaultDisplay(); 645 display_manager_->InitDefaultDisplay();
641 646
642 display_manager_->RefreshFontParams(); 647 display_manager_->RefreshFontParams();
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 897 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
893 return std::unique_ptr<ui::EventTargetIterator>(); 898 return std::unique_ptr<ui::EventTargetIterator>();
894 } 899 }
895 900
896 ui::EventTargeter* Shell::GetEventTargeter() { 901 ui::EventTargeter* Shell::GetEventTargeter() {
897 NOTREACHED(); 902 NOTREACHED();
898 return nullptr; 903 return nullptr;
899 } 904 }
900 905
901 } // namespace ash 906 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698