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

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

Issue 2731283004: Do not use ash in chromeos::EventRewriter. (Closed)
Patch Set: Address review issues. Created 3 years, 9 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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/sticky_keys/sticky_keys_controller.h"
14 #include "base/bind.h" 15 #include "base/bind.h"
15 #include "base/callback.h" 16 #include "base/callback.h"
16 #include "base/command_line.h" 17 #include "base/command_line.h"
17 #include "base/files/file_util.h" 18 #include "base/files/file_util.h"
18 #include "base/lazy_instance.h" 19 #include "base/lazy_instance.h"
19 #include "base/linux_util.h" 20 #include "base/linux_util.h"
20 #include "base/macros.h" 21 #include "base/macros.h"
21 #include "base/memory/ptr_util.h" 22 #include "base/memory/ptr_util.h"
22 #include "base/path_service.h" 23 #include "base/path_service.h"
23 #include "base/strings/string_number_conversions.h" 24 #include "base/strings/string_number_conversions.h"
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 data_promo_notification_.reset(new DataPromoNotification()); 800 data_promo_notification_.reset(new DataPromoNotification());
800 801
801 // TODO(mash): Support EventRewriterController; see crbug.com/647781 802 // TODO(mash): Support EventRewriterController; see crbug.com/647781
802 keyboard_event_rewriters_.reset(new EventRewriterController()); 803 keyboard_event_rewriters_.reset(new EventRewriterController());
803 keyboard_event_rewriters_->AddEventRewriter( 804 keyboard_event_rewriters_->AddEventRewriter(
804 std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); 805 std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
805 keyboard_event_rewriters_->AddEventRewriter( 806 keyboard_event_rewriters_->AddEventRewriter(
806 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); 807 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter()));
807 keyboard_event_rewriters_->AddEventRewriter( 808 keyboard_event_rewriters_->AddEventRewriter(
808 std::unique_ptr<ui::EventRewriter>(new EventRewriter( 809 std::unique_ptr<ui::EventRewriter>(new EventRewriter(
809 ash::Shell::GetInstance()->sticky_keys_controller()))); 810 ash::Shell::GetInstance()->sticky_keys_controller())));
xiyuan 2017/03/09 18:49:29 The CL changes StickyKeysController to be an ui::E
Peng 2017/03/09 18:58:45 https://codereview.chromium.org/2724913002/ - In t
xiyuan 2017/03/09 19:26:50 I understand the goal. My point is changing Sticky
xiyuan 2017/03/09 20:23:00 Per offline discussion, using a StickyKeysControll
810 keyboard_event_rewriters_->Init(); 811 keyboard_event_rewriters_->Init();
811 } 812 }
812 813
813 // In classic ash must occur after ash::WmShell is initialized. Triggers a 814 // In classic ash must occur after ash::WmShell is initialized. Triggers a
814 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy. 815 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy.
815 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>(); 816 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>();
816 817
817 ChromeBrowserMainPartsLinux::PostBrowserStart(); 818 ChromeBrowserMainPartsLinux::PostBrowserStart();
818 } 819 }
819 820
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 958
958 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 959 ChromeBrowserMainPartsLinux::PostDestroyThreads();
959 960
960 // Destroy DeviceSettingsService after g_browser_process. 961 // Destroy DeviceSettingsService after g_browser_process.
961 DeviceSettingsService::Shutdown(); 962 DeviceSettingsService::Shutdown();
962 963
963 chromeos::ShutdownCloseTracking(); 964 chromeos::ShutdownCloseTracking();
964 } 965 }
965 966
966 } // namespace chromeos 967 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/sticky_keys/sticky_keys_unittest.cc ('k') | chrome/browser/chromeos/events/event_rewriter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698