[Mac] The infobar's top arrow should be hidden while the omnibox popup is shown

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 2012 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 #include <utility>
 
@@ skipping 67 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
+#include "components/omnibox/browser/omnibox_edit_model.h"
+#include "components/omnibox/browser/omnibox_popup_model.h"
+#include "components/omnibox/browser/omnibox_popup_model_observer.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/browser/translate_ui_delegate.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
@@ skipping 81 matching lines @@
 // set a flag, and constrain any resize by the allowed amounts. On further
 // shrinks, we check the flag (since the size/position of the window will no
 // longer indicate that the window is shrinking from an apparent zoomed state)
 // and if it's set we continue to constrain the resize.
 
 using content::RenderWidgetHostView;
 using content::WebContents;
 
 namespace {
 
+// This class shows or hides the top arrow of the infobar in accordance with the
+// visibility of the omnibox popup. It hides the top arrow when the omnibox
+// popup is shown, and vice versa.
+class OmniboxPopupModelObserverBridge final : public OmniboxPopupModelObserver {
+ public:
+  explicit OmniboxPopupModelObserverBridge(BrowserWindowController* controller)
+      : controller_(controller),
+        omnibox_popup_model_(nullptr) {
+    DCHECK(controller_);
+    omnibox_popup_model_ = [controller_ locationBarBridge]

[Robert Sesek, 2016/08/04 17:13:41]

You could move this to the initializer list and remove the DCHECK on line 200.

[Sungmann Cho, 2016/08/04 17:42:27]

Done.

+        ->GetOmniboxView()->model()->popup_model();
+    DCHECK(omnibox_popup_model_);
+    omnibox_popup_model_->AddObserver(this);
+  }
+
+  ~OmniboxPopupModelObserverBridge() {
+    omnibox_popup_model_->RemoveObserver(this);
+  }
+
+  void OnOmniboxPopupShownOrHidden() override {
+    InfoBarContainerController* infobar_container_controller =
+        [controller_ infoBarContainerController];
+    int max_top_arrow_height = 0;
+    if (!omnibox_popup_model_->IsOpen()) {
+      max_top_arrow_height =
+          [infobar_container_controller defaultMaxTopArrowHeight];
+    }
+    [infobar_container_controller setMaxTopArrowHeight:max_top_arrow_height];
+  }
+
+ private:
+  BrowserWindowController* controller_;
+  OmniboxPopupModel* omnibox_popup_model_;
+};

[Robert Sesek, 2016/08/04 17:13:41]

DISALLOW_COPY_AND_ASSIGN

[Sungmann Cho, 2016/08/04 17:42:26]

Done.

+
 void SetUpBrowserWindowCommandHandler(NSWindow* window) {
   // Make the window handle browser window commands.
   [base::mac::ObjCCastStrict<ChromeEventProcessingWindow>(window)
       setCommandHandler:[[[BrowserWindowCommandHandler alloc] init]
                             autorelease]];
 }
 
 // Returns true if the Tab Detaching in Fullscreen is enabled. It's enabled by
 // default.
 bool IsTabDetachingInFullscreenEnabled() {
@@ skipping 195 matching lines @@
     // on the window bounds to determine whether to show buttons or not.
     if ([self hasToolbar])  // Do not create the buttons in popups.
       [toolbarController_ createBrowserActionButtons];
 
     extension_keybinding_registry_.reset(
         new ExtensionKeybindingRegistryCocoa(browser_->profile(),
             [self window],
             extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS,
             windowShim_.get()));
 
+    omnibox_popup_model_observer_bridge_.reset(
+        new OmniboxPopupModelObserverBridge(self));
+
     PrefService* prefs = browser_->profile()->GetPrefs();
     shouldShowFullscreenToolbar_ =
         prefs->GetBoolean(prefs::kShowFullscreenToolbar);
     blockLayoutSubviews_ = NO;
 
     // We are done initializing now.
     initializing_ = NO;
   }
   return self;
 }
@@ skipping 1641 matching lines @@
 
 - (NSRect)savedRegularWindowFrame {
   return savedRegularWindowFrame_;
 }
 
 - (BOOL)isFullscreenTransitionInProgress {
   return enteringAppKitFullscreen_ || exitingAppKitFullscreen_;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)