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

Side by Side Diff: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

Issue 2898873002: Merges google_input_tools extension into google_xkb extension. The google input tools extension rel… (Closed)
Patch Set: Created 3 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 | « no previous file | chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h" 5 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 27 matching lines...) Expand all
38 38
39 struct WhitelistedComponentExtensionIME { 39 struct WhitelistedComponentExtensionIME {
40 const char* id; 40 const char* id;
41 int manifest_resource_id; 41 int manifest_resource_id;
42 } whitelisted_component_extension[] = { 42 } whitelisted_component_extension[] = {
43 #if defined(GOOGLE_CHROME_BUILD) 43 #if defined(GOOGLE_CHROME_BUILD)
44 { 44 {
45 // Official Google XKB Input. 45 // Official Google XKB Input.
46 extension_ime_util::kXkbExtensionId, IDR_GOOGLE_XKB_MANIFEST, 46 extension_ime_util::kXkbExtensionId, IDR_GOOGLE_XKB_MANIFEST,
47 }, 47 },
48 {
49 // Google input tools.
50 extension_ime_util::kT13nExtensionId, IDR_GOOGLE_INPUT_TOOLS_MANIFEST,
51 },
52 #else 48 #else
53 { 49 {
54 // Open-sourced ChromeOS xkb extension. 50 // Open-sourced ChromeOS xkb extension.
55 extension_ime_util::kXkbExtensionId, IDR_XKB_MANIFEST, 51 extension_ime_util::kXkbExtensionId, IDR_XKB_MANIFEST,
56 }, 52 },
57 { 53 {
58 // Open-sourced ChromeOS Keyboards extension. 54 // Open-sourced ChromeOS Keyboards extension.
59 extension_ime_util::kM17nExtensionId, IDR_M17N_MANIFEST, 55 extension_ime_util::kM17nExtensionId, IDR_M17N_MANIFEST,
60 }, 56 },
61 { 57 {
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 338
343 ComponentExtensionEngine engine; 339 ComponentExtensionEngine engine;
344 ReadEngineComponent(component_ime, *dictionary, &engine); 340 ReadEngineComponent(component_ime, *dictionary, &engine);
345 component_ime.engines.push_back(engine); 341 component_ime.engines.push_back(engine);
346 } 342 }
347 out_imes->push_back(component_ime); 343 out_imes->push_back(component_ime);
348 } 344 }
349 } 345 }
350 346
351 } // namespace chromeos 347 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698