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

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

Issue 11411133: Add command line flag to enable/disable apps_debugger. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase Created 8 years 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 | « no previous file | chrome/common/chrome_switches.h » ('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) 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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 void ComponentLoader::AddDefaultComponentExtensions() { 322 void ComponentLoader::AddDefaultComponentExtensions() {
323 #if defined(OS_CHROMEOS) 323 #if defined(OS_CHROMEOS)
324 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) 324 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession))
325 Add(IDR_BOOKMARKS_MANIFEST, 325 Add(IDR_BOOKMARKS_MANIFEST,
326 FilePath(FILE_PATH_LITERAL("bookmark_manager"))); 326 FilePath(FILE_PATH_LITERAL("bookmark_manager")));
327 #else 327 #else
328 Add(IDR_BOOKMARKS_MANIFEST, FilePath(FILE_PATH_LITERAL("bookmark_manager"))); 328 Add(IDR_BOOKMARKS_MANIFEST, FilePath(FILE_PATH_LITERAL("bookmark_manager")));
329 #endif 329 #endif
330 330
331 // Apps Debugger 331 // Apps Debugger
332 Add(IDR_APPS_DEBUGGER_MANIFEST, 332 if (CommandLine::ForCurrentProcess()->HasSwitch(
333 FilePath(FILE_PATH_LITERAL("apps_debugger"))); 333 switches::kAppsDebugger)) {
334 Add(IDR_APPS_DEBUGGER_MANIFEST,
335 FilePath(FILE_PATH_LITERAL("apps_debugger")));
336 }
334 337
335 #if defined(OS_CHROMEOS) 338 #if defined(OS_CHROMEOS)
336 Add(IDR_WALLPAPERMANAGER_MANIFEST, 339 Add(IDR_WALLPAPERMANAGER_MANIFEST,
337 FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); 340 FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager")));
338 #endif 341 #endif
339 342
340 #if defined(FILE_MANAGER_EXTENSION) 343 #if defined(FILE_MANAGER_EXTENSION)
341 AddFileManagerExtension(); 344 AddFileManagerExtension();
342 #endif 345 #endif
343 346
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { 412 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
410 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 413 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
411 std::string() /* default_value */, 414 std::string() /* default_value */,
412 PrefService::UNSYNCABLE_PREF); 415 PrefService::UNSYNCABLE_PREF);
413 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, 416 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
414 std::string() /* default_value */, 417 std::string() /* default_value */,
415 PrefService::UNSYNCABLE_PREF); 418 PrefService::UNSYNCABLE_PREF);
416 } 419 }
417 420
418 } // namespace extensions 421 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698