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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/error_console/error_console.h" 5 #include "chrome/browser/extensions/error_console/error_console.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/stl_util.h" 13 #include "base/stl_util.h"
15 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/extensions/error_console/error_console_factory.h" 16 #include "chrome/browser/extensions/error_console/error_console_factory.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/common/extensions/features/feature_channel.h" 18 #include "chrome/common/extensions/features/feature_channel.h"
20 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
21 #include "components/crx_file/id_util.h" 20 #include "components/crx_file/id_util.h"
21 #include "components/prefs/pref_service.h"
22 #include "components/version_info/version_info.h" 22 #include "components/version_info/version_info.h"
23 #include "content/public/browser/notification_details.h" 23 #include "content/public/browser/notification_details.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "content/public/browser/notification_source.h" 25 #include "content/public/browser/notification_source.h"
26 #include "extensions/browser/extension_prefs.h" 26 #include "extensions/browser/extension_prefs.h"
27 #include "extensions/browser/extension_registry.h" 27 #include "extensions/browser/extension_registry.h"
28 #include "extensions/browser/extension_system.h" 28 #include "extensions/browser/extension_system.h"
29 #include "extensions/common/constants.h" 29 #include "extensions/common/constants.h"
30 #include "extensions/common/extension.h" 30 #include "extensions/common/extension.h"
31 #include "extensions/common/extension_set.h" 31 #include "extensions/common/extension_set.h"
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 ExtensionRegistry::Get(profile_)->GetExtensionById( 293 ExtensionRegistry::Get(profile_)->GetExtensionById(
294 extension_id, ExtensionRegistry::EVERYTHING); 294 extension_id, ExtensionRegistry::EVERYTHING);
295 if (extension && extension->location() == Manifest::UNPACKED) 295 if (extension && extension->location() == Manifest::UNPACKED)
296 return (1 << ExtensionError::NUM_ERROR_TYPES) - 1; 296 return (1 << ExtensionError::NUM_ERROR_TYPES) - 1;
297 297
298 // Otherwise, use the default mask. 298 // Otherwise, use the default mask.
299 return default_mask_; 299 return default_mask_;
300 } 300 }
301 301
302 } // namespace extensions 302 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698