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

Side by Side Diff: ash/shell.cc

Issue 2831583005: Enable Config::MUS to use classic IME instead of servicified IME. (Closed)
Patch Set: Addressed feedback. Created 3 years, 7 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/mus/bridge/shell_port_mash.cc ('k') | ui/aura/mus/window_tree_client.cc » ('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 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 } 928 }
929 929
930 if (cursor_manager_) { 930 if (cursor_manager_) {
931 cursor_manager_->SetDisplay( 931 cursor_manager_->SetDisplay(
932 display::Screen::GetScreen()->GetPrimaryDisplay()); 932 display::Screen::GetScreen()->GetPrimaryDisplay());
933 } 933 }
934 934
935 accelerator_controller_ = shell_port_->CreateAcceleratorController(); 935 accelerator_controller_ = shell_port_->CreateAcceleratorController();
936 maximize_mode_controller_ = base::MakeUnique<MaximizeModeController>(); 936 maximize_mode_controller_ = base::MakeUnique<MaximizeModeController>();
937 937
938 if (config == Config::CLASSIC) { 938 if (config == Config::CLASSIC || config == Config::MUS) {
939 // Not applicable to mus/mash as events are already routed to InputMethod 939 // Not applicable to mash as events are already routed to InputMethod first.
940 // first.
941 AddPreTargetHandler( 940 AddPreTargetHandler(
942 window_tree_host_manager_->input_method_event_handler()); 941 window_tree_host_manager_->input_method_event_handler());
943 } 942 }
944 943
945 magnifier_key_scroll_handler_ = MagnifierKeyScroller::CreateHandler(); 944 magnifier_key_scroll_handler_ = MagnifierKeyScroller::CreateHandler();
946 AddPreTargetHandler(magnifier_key_scroll_handler_.get()); 945 AddPreTargetHandler(magnifier_key_scroll_handler_.get());
947 speech_feedback_handler_ = SpokenFeedbackToggler::CreateHandler(); 946 speech_feedback_handler_ = SpokenFeedbackToggler::CreateHandler();
948 AddPreTargetHandler(speech_feedback_handler_.get()); 947 AddPreTargetHandler(speech_feedback_handler_.get());
949 948
950 // The order in which event filters are added is significant. 949 // The order in which event filters are added is significant.
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1242 void Shell::OnPrefServiceInitialized( 1241 void Shell::OnPrefServiceInitialized(
1243 std::unique_ptr<::PrefService> pref_service) { 1242 std::unique_ptr<::PrefService> pref_service) {
1244 if (!instance_) 1243 if (!instance_)
1245 return; 1244 return;
1246 // |pref_service_| is null if can't connect to Chrome (as happens when 1245 // |pref_service_| is null if can't connect to Chrome (as happens when
1247 // running mash outside of chrome --mash and chrome isn't built). 1246 // running mash outside of chrome --mash and chrome isn't built).
1248 pref_service_ = std::move(pref_service); 1247 pref_service_ = std::move(pref_service);
1249 } 1248 }
1250 1249
1251 } // namespace ash 1250 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/shell_port_mash.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698