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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 keyboard_event_rewriters_->AddEventRewriter( 826 keyboard_event_rewriters_->AddEventRewriter(
827 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); 827 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter()));
828 event_rewriter_delegate_ = base::MakeUnique<EventRewriterDelegateImpl>(); 828 event_rewriter_delegate_ = base::MakeUnique<EventRewriterDelegateImpl>();
829 keyboard_event_rewriters_->AddEventRewriter( 829 keyboard_event_rewriters_->AddEventRewriter(
830 base::MakeUnique<ui::EventRewriterChromeOS>( 830 base::MakeUnique<ui::EventRewriterChromeOS>(
831 event_rewriter_delegate_.get(), 831 event_rewriter_delegate_.get(),
832 ash::Shell::Get()->sticky_keys_controller())); 832 ash::Shell::Get()->sticky_keys_controller()));
833 keyboard_event_rewriters_->Init(); 833 keyboard_event_rewriters_->Init();
834 } 834 }
835 835
836 // In classic ash must occur after ash::WmShell is initialized. Triggers a 836 // In classic ash must occur after ash::ShellPort is initialized. Triggers a
837 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy. 837 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy.
838 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>(); 838 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>();
839 839
840 ChromeBrowserMainPartsLinux::PostBrowserStart(); 840 ChromeBrowserMainPartsLinux::PostBrowserStart();
841 } 841 }
842 842
843 // Shut down services before the browser process, etc are destroyed. 843 // Shut down services before the browser process, etc are destroyed.
844 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { 844 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
845 chromeos::ResourceReporter::GetInstance()->StopMonitoring(); 845 chromeos::ResourceReporter::GetInstance()->StopMonitoring();
846 846
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 980
981 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 981 ChromeBrowserMainPartsLinux::PostDestroyThreads();
982 982
983 // Destroy DeviceSettingsService after g_browser_process. 983 // Destroy DeviceSettingsService after g_browser_process.
984 DeviceSettingsService::Shutdown(); 984 DeviceSettingsService::Shutdown();
985 985
986 chromeos::ShutdownCloseTracking(); 986 chromeos::ShutdownCloseTracking();
987 } 987 }
988 988
989 } // namespace chromeos 989 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698