Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / extensions / extension_message_bubble_view.cc

diff --git a/src/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc b/src/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
index 068efd3..b33beb6 100644 (file)
--- a/src/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
+++ b/src/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
@@ -62,14 +62,14 @@ ExtensionMessageBubbleView::ExtensionMessageBubbleView(
     views::BubbleBorder::Arrow arrow_location,
     scoped_ptr<extensions::ExtensionMessageBubbleController> controller)
     : BubbleDelegateView(anchor_view, arrow_location),
-      weak_factory_(this),
       controller_(controller.Pass()),
       anchor_view_(anchor_view),
       headline_(NULL),
       learn_more_(NULL),
       dismiss_button_(NULL),
       link_clicked_(false),
-      action_taken_(false) {
+      action_taken_(false),
+      weak_factory_(this) {
   DCHECK(anchor_view->GetWidget());
   set_close_on_deactivate(controller_->CloseOnDeactivate());
   set_close_on_esc(true);
@@ -485,7 +485,7 @@ void ExtensionMessageBubbleFactory::ShowHighlightingBubble() {
   stage_ = STAGE_COMPLETE;
 
   views::View* reference_view = NULL;
-  if (container_->num_browser_actions() > 0)
+  if (container_->num_browser_actions() > 0u)
     reference_view = container_->GetBrowserActionViewAt(0);
   if (reference_view && reference_view->visible())
     anchor_view_ = reference_view;