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

Side by Side Diff: chrome/browser/extensions/component_loader.cc

Issue 8566002: Use USE_VIRTUAL_KEYBOARD instead of TOUCH_UI when loading virtual keyboard component extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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 | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/extensions/component_loader.h" 5 #include "chrome/browser/extensions/component_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/json/json_value_serializer.h" 9 #include "base/json/json_value_serializer.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 // Bookmark manager. 143 // Bookmark manager.
144 component_extensions.push_back(std::make_pair( 144 component_extensions.push_back(std::make_pair(
145 FILE_PATH_LITERAL("bookmark_manager"), 145 FILE_PATH_LITERAL("bookmark_manager"),
146 IDR_BOOKMARKS_MANIFEST)); 146 IDR_BOOKMARKS_MANIFEST));
147 147
148 #if defined(FILE_MANAGER_EXTENSION) 148 #if defined(FILE_MANAGER_EXTENSION)
149 AddFileManagerExtension(&component_extensions); 149 AddFileManagerExtension(&component_extensions);
150 #endif 150 #endif
151 151
152 #if defined(TOUCH_UI) 152 #if defined(USE_VIRTUAL_KEYBOARD)
153 component_extensions.push_back(std::make_pair( 153 component_extensions.push_back(std::make_pair(
154 FILE_PATH_LITERAL("keyboard"), 154 FILE_PATH_LITERAL("keyboard"),
155 IDR_KEYBOARD_MANIFEST)); 155 IDR_KEYBOARD_MANIFEST));
156 #endif 156 #endif
157 157
158 #if defined(OS_CHROMEOS) 158 #if defined(OS_CHROMEOS)
159 component_extensions.push_back(std::make_pair( 159 component_extensions.push_back(std::make_pair(
160 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"), 160 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"),
161 IDR_MOBILE_MANIFEST)); 161 IDR_MOBILE_MANIFEST));
162 162
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 .AppendASCII(extension_misc::kChromeVoxDirectoryName); 219 .AppendASCII(extension_misc::kChromeVoxDirectoryName);
220 std::string manifest = 220 std::string manifest =
221 ResourceBundle::GetSharedInstance().GetRawDataResource( 221 ResourceBundle::GetSharedInstance().GetRawDataResource(
222 IDR_CHROMEVOX_MANIFEST).as_string(); 222 IDR_CHROMEVOX_MANIFEST).as_string();
223 Add(manifest, path); 223 Add(manifest, path);
224 } 224 }
225 #endif 225 #endif
226 } 226 }
227 227
228 } // namespace extensions 228 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698