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

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

Issue 555253005: Remove implicit conversions from scoped_refptr to T* in c/b/chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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) 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 "chrome/browser/chromeos/preferences.h" 5 #include "chrome/browser/chromeos/preferences.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/autoclick/autoclick_controller.h" 9 #include "ash/autoclick/autoclick_controller.h"
10 #include "ash/magnifier/magnifier_constants.h" 10 #include "ash/magnifier/magnifier_constants.h"
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 session_manager->SetFirstLoginPrefs(profile, std::string(), std::string()); 380 session_manager->SetFirstLoginPrefs(profile, std::string(), std::string());
381 } 381 }
382 382
383 void Preferences::InitUserPrefsForTesting( 383 void Preferences::InitUserPrefsForTesting(
384 PrefServiceSyncable* prefs, 384 PrefServiceSyncable* prefs,
385 const user_manager::User* user, 385 const user_manager::User* user,
386 scoped_refptr<input_method::InputMethodManager::State> ime_state) { 386 scoped_refptr<input_method::InputMethodManager::State> ime_state) {
387 user_ = user; 387 user_ = user;
388 ime_state_ = ime_state; 388 ime_state_ = ime_state;
389 389
390 if (ime_state) 390 if (ime_state.get())
391 input_method_manager_->SetState(ime_state); 391 input_method_manager_->SetState(ime_state);
392 392
393 InitUserPrefs(prefs); 393 InitUserPrefs(prefs);
394 } 394 }
395 395
396 void Preferences::SetInputMethodListForTesting() { 396 void Preferences::SetInputMethodListForTesting() {
397 SetInputMethodList(); 397 SetInputMethodList();
398 } 398 }
399 399
400 void Preferences::OnPreferenceChanged(const std::string& pref_name) { 400 void Preferences::OnPreferenceChanged(const std::string& pref_name) {
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 touch_hud_projection_enabled_.SetValue(enabled); 665 touch_hud_projection_enabled_.SetValue(enabled);
666 } 666 }
667 667
668 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { 668 void Preferences::ActiveUserChanged(const user_manager::User* active_user) {
669 if (active_user != user_) 669 if (active_user != user_)
670 return; 670 return;
671 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); 671 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, "");
672 } 672 }
673 673
674 } // namespace chromeos 674 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698