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

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

Issue 11307020: Cleanup: Simplify some extensions / content_settings Observer code by simply DCHECKING instead of u… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | 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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 AddChromeApp(); 404 AddChromeApp();
405 #endif 405 #endif
406 406
407 AddScriptBubble(); 407 AddScriptBubble();
408 } 408 }
409 409
410 void ComponentLoader::Observe( 410 void ComponentLoader::Observe(
411 int type, 411 int type,
412 const content::NotificationSource& source, 412 const content::NotificationSource& source,
413 const content::NotificationDetails& details) { 413 const content::NotificationDetails& details) {
414 if (type == chrome::NOTIFICATION_PREF_CHANGED) { 414 DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED);
415 const std::string* name = 415 DCHECK_EQ(*content::Details<const std::string>(details).ptr(),
416 content::Details<const std::string>(details).ptr(); 416 std::string(prefs::kEnterpriseWebStoreURL));
417 if (*name == prefs::kEnterpriseWebStoreURL) 417 AddOrReloadEnterpriseWebStore();
418 AddOrReloadEnterpriseWebStore();
419 else
420 NOTREACHED();
421 } else {
422 NOTREACHED();
423 }
424 } 418 }
425 419
426 // static 420 // static
427 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { 421 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
428 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 422 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
429 std::string() /* default_value */, 423 std::string() /* default_value */,
430 PrefService::UNSYNCABLE_PREF); 424 PrefService::UNSYNCABLE_PREF);
431 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, 425 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
432 std::string() /* default_value */, 426 std::string() /* default_value */,
433 PrefService::UNSYNCABLE_PREF); 427 PrefService::UNSYNCABLE_PREF);
434 } 428 }
435 429
436 } // namespace extensions 430 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698