Upstream version 7.36.149.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 2e58aae..43532db 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
@@ -69,7 +69,6 @@ ExtensionMessageBubbleView::ExtensionMessageBubbleView(
       action_taken_(false) {
   DCHECK(anchor_view->GetWidget());
   set_close_on_deactivate(controller_->CloseOnDeactivate());
-  set_move_with_anchor(true);
   set_close_on_esc(true);
 
   // Compensate for built-in vertical padding in the anchor view's image.
@@ -285,6 +284,9 @@ ExtensionMessageBubbleFactory::~ExtensionMessageBubbleFactory() {
 
 void ExtensionMessageBubbleFactory::MaybeShow(views::View* anchor_view) {
 #if defined(OS_WIN)
+  bool is_initial_check = IsInitialProfileCheck(profile_->GetOriginalProfile());
+  RecordProfileCheck(profile_->GetOriginalProfile());
+
   // The list of suspicious extensions takes priority over the dev mode bubble
   // and the settings API bubble, since that needs to be shown as soon as we
   // disable something. The settings API bubble is shown on first startup after
@@ -293,20 +295,17 @@ void ExtensionMessageBubbleFactory::MaybeShow(views::View* anchor_view) {
   // The dev mode bubble is not time sensitive like the other two so we'll catch
   // the dev mode extensions on the next startup/next window that opens. That
   // way, we're not too spammy with the bubbles.
-  if (!shown_suspicious_extensions_bubble_) {
-    if (MaybeShowSuspiciousExtensionsBubble(anchor_view))
-      return;
-  }
+  if (!shown_suspicious_extensions_bubble_ &&
+      MaybeShowSuspiciousExtensionsBubble(anchor_view))
+    return;
 
   if (!shown_startup_override_extensions_bubble_ &&
-      IsInitialProfileCheck(profile_->GetOriginalProfile()) &&
+      is_initial_check &&
       MaybeShowStartupOverrideExtensionsBubble(anchor_view))
     return;
 
   if (!shown_dev_mode_extensions_bubble_)
     MaybeShowDevModeExtensionsBubble(anchor_view);
-
-  RecordProfileCheck(profile_->GetOriginalProfile());
 #endif  // OS_WIN
 }