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

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

Issue 328303008: athena: Use mojo to provide the bindings for the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « ui/keyboard/keyboard.h ('k') | ui/keyboard/keyboard.gyp » ('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) 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 #include "ui/keyboard/webui/vk_webui_controller.h"
10 11
11 namespace keyboard { 12 namespace keyboard {
12 13
13 static bool initialized = false; 14 static bool initialized = false;
14 15
15 void ResetKeyboardForTesting() { 16 void ResetKeyboardForTesting() {
16 initialized = false; 17 initialized = false;
17 } 18 }
18 19
19 void InitializeKeyboard() { 20 void InitializeKeyboard() {
20 if (initialized) 21 if (initialized)
21 return; 22 return;
22 initialized = true; 23 initialized = true;
23 24
24 base::FilePath pak_dir; 25 base::FilePath pak_dir;
25 PathService::Get(base::DIR_MODULE, &pak_dir); 26 PathService::Get(base::DIR_MODULE, &pak_dir);
26 base::FilePath pak_file = pak_dir.Append( 27 base::FilePath pak_file = pak_dir.Append(
27 FILE_PATH_LITERAL("keyboard_resources.pak")); 28 FILE_PATH_LITERAL("keyboard_resources.pak"));
28 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( 29 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
29 pak_file, ui::SCALE_FACTOR_100P); 30 pak_file, ui::SCALE_FACTOR_100P);
30 } 31 }
31 32
33 void InitializeWebUIBindings() {
34 CHECK(initialized);
35 base::FilePath content_resources;
36 DCHECK(PathService::Get(base::DIR_MODULE, &content_resources));
37 content_resources =
38 content_resources.Append(FILE_PATH_LITERAL("content_resources.pak"));
39 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
40 content_resources, ui::SCALE_FACTOR_100P);
41
42 content::WebUIControllerFactory::RegisterFactory(
43 VKWebUIControllerFactory::GetInstance());
44 }
45
32 } // namespace keyboard 46 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard.h ('k') | ui/keyboard/keyboard.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698