Enable Error Console for ADT and <= Dev Channel

chrome/browser/extensions/error_console/error_console.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_ERROR_CONSOLE_ERROR_CONSOLE_H_
 #define CHROME_BROWSER_EXTENSIONS_ERROR_CONSOLE_ERROR_CONSOLE_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 60 matching lines @@
 
   // Get a collection of weak pointers to all errors relating to the extension
   // with the given |extension_id|.
   const ErrorList& GetErrorsForExtension(const std::string& extension_id) const;
 
   // Add or remove observers of the ErrorConsole to be notified of any errors
   // added.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  bool enabled() const { return enabled_; }
+  // Returns whether or not the ErrorConsole is enabled for the
+  // chrome:extensions page or the Chrome Apps Developer Tools.
+  // TODO(rdevlin.cronin): These have different answers - ErrorConsole is
+  // enabled by default in ADT, but only Dev Channel for chrome:extensoins (or

[not at google - send to devlin, 2014/03/28 22:05:32]

chrome://extensions

you misspelled extensions.

[Devlin, 2014/03/31 18:39:31]

Done.

+  // with the commandline switch). Once we do a full launch, clean all this up.
+  bool IsEnabledForChromeExtensionsPage() const;
+  bool IsEnabledForAppsDeveloperTools() const;
 
   // Return the number of entries (extensions) in the error map.
   size_t get_num_entries_for_test() const { return errors_.size(); }
 
   // Set the default reporting for all extensions.
   void set_default_reporting_for_test(ExtensionError::Type type, bool enabled) {
     default_mask_ =
         enabled ? default_mask_ | (1 << type) : default_mask_ & ~(1 << type);
   }
 
@@ skipping 16 matching lines @@
   void OnPrefChanged();
 
   // Add manifest errors from an extension's install warnings.
   void AddManifestErrorsForExtension(const Extension* extension);
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Whether or not the error console is enabled; it is enabled if the
-  // FeatureSwitch (FeatureSwitch::error_console) is enabled and the user is
-  // in Developer Mode.
-  bool enabled_;
+  // Whether or not the error console should record errors. This is true if
+  // the user is in developer mode, and at least one of the following is true:
+  // - The Chrome Apps Developer Tools are installed.
+  // - FeatureSwitch::error_console() is enabled.
+  // - This is a Dev Channel release.
+  bool should_record_;
 
   // Needed because ObserverList is not thread-safe.
   base::ThreadChecker thread_checker_;
 
   // The list of all observers for the ErrorConsole.
   ObserverList<Observer> observers_;
 
   // The errors which we have received so far.
   ErrorMap errors_;
 
@@ skipping 10 matching lines @@
 
   content::NotificationRegistrar notification_registrar_;
   PrefChangeRegistrar pref_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorConsole);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ERROR_CONSOLE_ERROR_CONSOLE_H_