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

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

Issue 10399046: Remove virtual keyboard support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_string_value_serializer.h" 9 #include "base/json/json_string_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 Add(IDR_BOOKMARKS_MANIFEST, 268 Add(IDR_BOOKMARKS_MANIFEST,
269 FilePath(FILE_PATH_LITERAL("bookmark_manager"))); 269 FilePath(FILE_PATH_LITERAL("bookmark_manager")));
270 #else 270 #else
271 Add(IDR_BOOKMARKS_MANIFEST, FilePath(FILE_PATH_LITERAL("bookmark_manager"))); 271 Add(IDR_BOOKMARKS_MANIFEST, FilePath(FILE_PATH_LITERAL("bookmark_manager")));
272 #endif 272 #endif
273 273
274 #if defined(FILE_MANAGER_EXTENSION) 274 #if defined(FILE_MANAGER_EXTENSION)
275 AddFileManagerExtension(); 275 AddFileManagerExtension();
276 #endif 276 #endif
277 277
278 #if defined(USE_VIRTUAL_KEYBOARD)
279 Add(IDR_KEYBOARD_MANIFEST, FilePath(FILE_PATH_LITERAL("keyboard")));
280 #endif
281
282 #if defined(OS_CHROMEOS) 278 #if defined(OS_CHROMEOS)
283 Add(IDR_MOBILE_MANIFEST, 279 Add(IDR_MOBILE_MANIFEST,
284 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"))); 280 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));
285 281
286 Add(IDR_CROSH_BUILTIN_MANIFEST, FilePath(FILE_PATH_LITERAL( 282 Add(IDR_CROSH_BUILTIN_MANIFEST, FilePath(FILE_PATH_LITERAL(
287 "/usr/share/chromeos-assets/crosh_builtin"))); 283 "/usr/share/chromeos-assets/crosh_builtin")));
288 284
289 const CommandLine* command_line = CommandLine::ForCurrentProcess(); 285 const CommandLine* command_line = CommandLine::ForCurrentProcess();
290 if (command_line->HasSwitch(switches::kAuthExtensionPath)) { 286 if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
291 FilePath auth_extension_path = 287 FilePath auth_extension_path =
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { 352 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
357 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 353 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
358 std::string() /* default_value */, 354 std::string() /* default_value */,
359 PrefService::UNSYNCABLE_PREF); 355 PrefService::UNSYNCABLE_PREF);
360 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, 356 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
361 std::string() /* default_value */, 357 std::string() /* default_value */,
362 PrefService::UNSYNCABLE_PREF); 358 PrefService::UNSYNCABLE_PREF);
363 } 359 }
364 360
365 } // namespace extensions 361 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/extensions/extension_function_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698