Resubmit: Rename BrowserActionView to ToolbarActionView

chrome/browser/ui/views/extensions/extension_message_bubble_view.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/dev_mode_bubble_controller.h"
@@ skipping 462 matching lines @@
     MaybeObserve();
   else
     ShowHighlightingBubble();
 }
 
 void ExtensionMessageBubbleFactory::ShowHighlightingBubble() {
   DCHECK_EQ(stage_, STAGE_HIGHLIGHTED);
   stage_ = STAGE_COMPLETE;
 
   views::View* reference_view = NULL;
-  if (container_->num_browser_actions() > 0u)
-    reference_view = container_->GetBrowserActionViewAt(0);
+  if (container_->num_toolbar_actions() > 0u)
+    reference_view = container_->GetToolbarActionViewAt(0);
   if (reference_view && reference_view->visible())
     anchor_view_ = reference_view;
 
   ExtensionMessageBubbleController* weak_controller = controller_.get();
   ExtensionMessageBubbleView* bubble_delegate =
       new ExtensionMessageBubbleView(
           anchor_view_,
           views::BubbleBorder::TOP_RIGHT,
           scoped_ptr<ExtensionMessageBubbleController>(
               controller_.release()));
   views::BubbleDelegateView::CreateBubble(bubble_delegate);
   weak_controller->Show(bubble_delegate);
 
   Finish();
 }
 
 void ExtensionMessageBubbleFactory::Finish() {
   MaybeStopObserving();
   controller_.reset();
   anchor_view_ = NULL;
   container_ = NULL;
 }
 
 }  // namespace extensions