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

Side by Side Diff: chrome/browser/chromeos/login/oobe_localization_browsertest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/task_runner.h" 8 #include "base/task_runner.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } 52 }
53 53
54 void set_keyboard_layout(const std::string& keyboard_layout) { 54 void set_keyboard_layout(const std::string& keyboard_layout) {
55 keyboard_layout_ = keyboard_layout; 55 keyboard_layout_ = keyboard_layout;
56 } 56 }
57 57
58 private: 58 private:
59 // StatisticsProvider overrides. 59 // StatisticsProvider overrides.
60 virtual void StartLoadingMachineStatistics( 60 virtual void StartLoadingMachineStatistics(
61 const scoped_refptr<base::TaskRunner>& file_task_runner, 61 const scoped_refptr<base::TaskRunner>& file_task_runner,
62 bool load_oem_manifest) OVERRIDE { 62 bool load_oem_manifest) override {
63 } 63 }
64 64
65 // Populates the named machine statistic for initial_locale and 65 // Populates the named machine statistic for initial_locale and
66 // keyboard_layout only. 66 // keyboard_layout only.
67 virtual bool GetMachineStatistic(const std::string& name, 67 virtual bool GetMachineStatistic(const std::string& name,
68 std::string* result) OVERRIDE { 68 std::string* result) override {
69 if (name == "initial_locale") 69 if (name == "initial_locale")
70 *result = initial_locale_; 70 *result = initial_locale_;
71 else if (name == "keyboard_layout") 71 else if (name == "keyboard_layout")
72 *result = keyboard_layout_; 72 *result = keyboard_layout_;
73 else 73 else
74 return false; 74 return false;
75 75
76 return true; 76 return true;
77 } 77 }
78 78
79 virtual bool GetMachineFlag(const std::string& name, bool* result) OVERRIDE { 79 virtual bool GetMachineFlag(const std::string& name, bool* result) override {
80 return false; 80 return false;
81 } 81 }
82 82
83 virtual void Shutdown() OVERRIDE { 83 virtual void Shutdown() override {
84 } 84 }
85 85
86 std::string initial_locale_; 86 std::string initial_locale_;
87 std::string keyboard_layout_; 87 std::string keyboard_layout_;
88 }; 88 };
89 89
90 } // namespace system 90 } // namespace system
91 91
92 class OobeLocalizationTest : public InProcessBrowserTest { 92 class OobeLocalizationTest : public InProcessBrowserTest {
93 public: 93 public:
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 "]"); 368 "]");
369 // Another syntetic example. Check that british keyboard is available. 369 // Another syntetic example. Check that british keyboard is available.
370 RunLocalizationTest("en-AU", 370 RunLocalizationTest("en-AU",
371 "xkb:us::eng", 371 "xkb:us::eng",
372 "en-AU", 372 "en-AU",
373 "xkb:us::eng", 373 "xkb:us::eng",
374 "xkb:us::eng,[xkb:gb:extd:eng,xkb:gb:dvorak:eng]"); 374 "xkb:us::eng,[xkb:gb:extd:eng,xkb:gb:dvorak:eng]");
375 } 375 }
376 376
377 } // namespace chromeos 377 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/oobe_browsertest.cc ('k') | chrome/browser/chromeos/login/profile_auth_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698