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

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

Issue 11048045: Allow settings dialog to be opened via the app launcher, as a packaged app. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: license stanza Created 8 years, 2 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
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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 #if defined(OFFICIAL_BUILD) 365 #if defined(OFFICIAL_BUILD)
366 if (browser_defaults::enable_help_app) { 366 if (browser_defaults::enable_help_app) {
367 Add(IDR_HELP_MANIFEST, 367 Add(IDR_HELP_MANIFEST,
368 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"))); 368 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp")));
369 } 369 }
370 #endif 370 #endif
371 #endif // !defined(OS_CHROMEOS) 371 #endif // !defined(OS_CHROMEOS)
372 372
373 Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store"))); 373 Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store")));
374 374
375 #if defined(OS_WIN)
376 if (CommandLine::ForCurrentProcess()->HasSwitch(
377 switches::kEnableSettingsApp)) {
378 Add(IDR_SETTINGS_APP_MANIFEST,
379 FilePath(FILE_PATH_LITERAL("settings_app")));
380 }
381 #endif
382
375 #if !defined(OS_CHROMEOS) 383 #if !defined(OS_CHROMEOS)
376 // Cloud Print component app. Not required on Chrome OS. 384 // Cloud Print component app. Not required on Chrome OS.
377 Add(IDR_CLOUDPRINT_MANIFEST, FilePath(FILE_PATH_LITERAL("cloud_print"))); 385 Add(IDR_CLOUDPRINT_MANIFEST, FilePath(FILE_PATH_LITERAL("cloud_print")));
378 #endif 386 #endif
379 387
380 #if defined(OS_CHROMEOS) 388 #if defined(OS_CHROMEOS)
381 // Register access extensions only if accessibility is enabled. 389 // Register access extensions only if accessibility is enabled.
382 if (local_state_->GetBoolean(prefs::kSpokenFeedbackEnabled)) { 390 if (local_state_->GetBoolean(prefs::kSpokenFeedbackEnabled)) {
383 FilePath path = FilePath(extension_misc::kAccessExtensionPath) 391 FilePath path = FilePath(extension_misc::kAccessExtensionPath)
384 .AppendASCII(extension_misc::kChromeVoxDirectoryName); 392 .AppendASCII(extension_misc::kChromeVoxDirectoryName);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { 427 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
420 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 428 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
421 std::string() /* default_value */, 429 std::string() /* default_value */,
422 PrefService::UNSYNCABLE_PREF); 430 PrefService::UNSYNCABLE_PREF);
423 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, 431 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
424 std::string() /* default_value */, 432 std::string() /* default_value */,
425 PrefService::UNSYNCABLE_PREF); 433 PrefService::UNSYNCABLE_PREF);
426 } 434 }
427 435
428 } // namespace extensions 436 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/app_window/app_window_api.cc ('k') | chrome/browser/extensions/image_loading_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698