Improve settings override bubble to indicate policy installed extensions

chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc

Index: chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc
diff --git a/chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc b/chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc
index be5a1951100177b43a2683a9c80178ca08f3262e..7a577a64d442bd2f186f60cdbc16eb6988fc6f7f 100644
--- a/chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc
+++ b/chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc
@@ -6,8 +6,10 @@
 
 #include "base/callback_helpers.h"
 #include "base/strings/string16.h"
+#include "grit/components_scaled_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 
 BlockedActionBubbleDelegate::BlockedActionBubbleDelegate(
     const base::Callback<void(CloseAction)>& callback,
@@ -62,3 +64,8 @@ void BlockedActionBubbleDelegate::OnBubbleShown() {}
 void BlockedActionBubbleDelegate::OnBubbleClosed(CloseAction action) {
   base::ResetAndReturn(&callback_).Run(action);
 }
+
+std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
+BlockedActionBubbleDelegate::GetExtraViewInfo() {
+  return NULL;

[Devlin, 2016/08/02 20:34:05]

prefer nullptr in new code.

[catmullings, 2016/08/13 00:35:52]

Done.

+}