Settings Overides -- warn user when extensions override their NTP.

chrome/browser/extensions/ntp_controlled_bubble_controller.h

Index: chrome/browser/extensions/ntp_controlled_bubble_controller.h
diff --git a/chrome/browser/extensions/settings_api_bubble_controller.h b/chrome/browser/extensions/ntp_controlled_bubble_controller.h
similarity index 52%
copy from chrome/browser/extensions/settings_api_bubble_controller.h
copy to chrome/browser/extensions/ntp_controlled_bubble_controller.h
index db734b40df88169e1789fd17bcfa7be045dcb3ee..2e009af6f8781f89242c8a92933ad308ca2f26dc 100644
--- a/chrome/browser/extensions/settings_api_bubble_controller.h
+++ b/chrome/browser/extensions/ntp_controlled_bubble_controller.h
@@ -2,23 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_SETTINGS_API_BUBBLE_CONTROLLER_H_
-#define CHROME_BROWSER_EXTENSIONS_SETTINGS_API_BUBBLE_CONTROLLER_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_NTP_CONTROLLED_BUBBLE_CONTROLLER_H_
+#define CHROME_BROWSER_EXTENSIONS_NTP_CONTROLLED_BUBBLE_CONTROLLER_H_
 
 #include <string>
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
-#include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 
 class ExtensionService;
 
 namespace extensions {
 
-class SettingsApiBubble;
-
-class SettingsApiBubbleController : public ExtensionMessageBubbleController {
+class NtpControlledBubbleController : public ExtensionMessageBubbleController {

[Yoyo Zhou, 2014/04/23 00:04:24]

How about NTPOverriddenBubbleController (since we call these override pages)? I
prefer "NTP" vs. "Ntp" but I don't feel strongly.

[Finnur, 2014/04/23 13:51:35]

Made the change Controlled -> Overridden, but Ntp seems to be favored in the
codebase over NTP.

On 2014/04/23 00:04:24, Yoyo Zhou wrote:

  public:
-  SettingsApiBubbleController(Profile* profile, SettingsApiOverrideType type);
-  virtual ~SettingsApiBubbleController();
+  explicit NtpControlledBubbleController(Profile* profile);
+  virtual ~NtpControlledBubbleController();
 
   // Whether the controller knows that we should show the bubble for extension
   // with |extension_id|. Returns true if so.
@@ -31,12 +28,9 @@ class SettingsApiBubbleController : public ExtensionMessageBubbleController {
   // A weak pointer to the profile we are associated with. Not owned by us.
   Profile* profile_;
 
-  // The type of settings override this bubble will report on.
-  SettingsApiOverrideType type_;
-
-  DISALLOW_COPY_AND_ASSIGN(SettingsApiBubbleController);
+  DISALLOW_COPY_AND_ASSIGN(NtpControlledBubbleController);
 };
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_SETTINGS_API_BUBBLE_CONTROLLER_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_NTP_CONTROLLED_BUBBLE_CONTROLLER_H_