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

Side by Side Diff: ui/keyboard/keyboard.cc

Issue 1130753004: virtual keyboard: It is not longer necessary to 'reset' for tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 | « ui/keyboard/keyboard.h ('k') | no next file » | 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) 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 "ui/keyboard/keyboard.h" 5 #include "ui/keyboard/keyboard.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 10
11 namespace keyboard { 11 namespace keyboard {
12 12
13 static bool initialized = false;
14
15 void ResetKeyboardForTesting() {
16 initialized = false;
17 }
18
19 void InitializeKeyboard() { 13 void InitializeKeyboard() {
14 static bool initialized = false;
20 if (initialized) 15 if (initialized)
21 return; 16 return;
22 initialized = true; 17 initialized = true;
23 18
24 base::FilePath pak_dir; 19 base::FilePath pak_dir;
25 PathService::Get(base::DIR_MODULE, &pak_dir); 20 PathService::Get(base::DIR_MODULE, &pak_dir);
26 base::FilePath pak_file = pak_dir.Append( 21 base::FilePath pak_file = pak_dir.Append(
27 FILE_PATH_LITERAL("keyboard_resources.pak")); 22 FILE_PATH_LITERAL("keyboard_resources.pak"));
28 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( 23 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
29 pak_file, ui::SCALE_FACTOR_100P); 24 pak_file, ui::SCALE_FACTOR_100P);
30 } 25 }
31 26
32 } // namespace keyboard 27 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698