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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 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
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 "base/prefs/pref_member.h" 7 #include "base/prefs/pref_member.h"
8 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" 8 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
9 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 9 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
10 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 10 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
11 #include "chrome/browser/download/download_prefs.h" 11 #include "chrome/browser/download/download_prefs.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "chrome/test/base/testing_pref_service_syncable.h" 13 #include "chrome/test/base/testing_pref_service_syncable.h"
14 #include "components/pref_registry/pref_registry_syncable.h" 14 #include "components/pref_registry/pref_registry_syncable.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 namespace { 18 namespace {
19 19
20 class MyMockInputMethodManager : public input_method::MockInputMethodManager { 20 class MyMockInputMethodManager : public input_method::MockInputMethodManager {
21 public: 21 public:
22 class State : public MockInputMethodManager::State { 22 class State : public MockInputMethodManager::State {
23 public: 23 public:
24 explicit State(MyMockInputMethodManager* manager) 24 explicit State(MyMockInputMethodManager* manager)
25 : MockInputMethodManager::State(manager), manager_(manager) {}; 25 : MockInputMethodManager::State(manager), manager_(manager) {};
26 26
27 virtual void ChangeInputMethod(const std::string& input_method_id, 27 virtual void ChangeInputMethod(const std::string& input_method_id,
28 bool show_message) OVERRIDE { 28 bool show_message) override {
29 manager_->last_input_method_id_ = input_method_id; 29 manager_->last_input_method_id_ = input_method_id;
30 // Do the same thing as BrowserStateMonitor::UpdateUserPreferences. 30 // Do the same thing as BrowserStateMonitor::UpdateUserPreferences.
31 const std::string current_input_method_on_pref = 31 const std::string current_input_method_on_pref =
32 manager_->current_->GetValue(); 32 manager_->current_->GetValue();
33 if (current_input_method_on_pref == input_method_id) 33 if (current_input_method_on_pref == input_method_id)
34 return; 34 return;
35 manager_->previous_->SetValue(current_input_method_on_pref); 35 manager_->previous_->SetValue(current_input_method_on_pref);
36 manager_->current_->SetValue(input_method_id); 36 manager_->current_->SetValue(input_method_id);
37 } 37 }
38 38
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 &prefs, test_user, mock_manager.GetActiveIMEState()); 91 &prefs, test_user, mock_manager.GetActiveIMEState());
92 testee.SetInputMethodListForTesting(); 92 testee.SetInputMethodListForTesting();
93 93
94 // Confirm they're unchanged. 94 // Confirm they're unchanged.
95 EXPECT_EQ("KeyboardA", previous.GetValue()); 95 EXPECT_EQ("KeyboardA", previous.GetValue());
96 EXPECT_EQ("KeyboardB", current.GetValue()); 96 EXPECT_EQ("KeyboardB", current.GetValue());
97 EXPECT_EQ("KeyboardB", mock_manager.last_input_method_id_); 97 EXPECT_EQ("KeyboardB", mock_manager.last_input_method_id_);
98 } 98 }
99 99
100 } // namespace chromeos 100 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences_browsertest.cc ('k') | chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698