Anchor the high contrast bubble to the app menu.

chrome/browser/ui/views/accessibility/invert_bubble_view.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/page_navigator.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
-#include "ui/gfx/sys_color_change_listener.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 const char kHighContrastExtensionUrl[] =
     "https://chrome.google.com/webstore/detail/djcfdncoelnlbldjfhinnjlhdjlikmph";
 const char kDarkThemeSearchUrl[] =
     "https://chrome.google.com/webstore/search-themes/dark";
 const char kLearnMoreUrl[] =
     "https://groups.google.com/a/googleproductforums.com/d/topic/chrome/Xrco2HsXS-8/discussion";
 const int kBubbleWidth = 500;
 
 class InvertBubbleView : public views::BubbleDelegateView,
                          public views::LinkListener {
  public:
   InvertBubbleView(Browser* browser, views::View* anchor_view);
   virtual ~InvertBubbleView();
 
  private:
   // Overridden from views::BubbleDelegateView:
   virtual void Init() OVERRIDE;
-  virtual gfx::Rect GetAnchorRect() OVERRIDE;
 
   // Overridden from views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   void OpenLink(const std::string& url, int event_flags);
 
   Browser* browser_;
   views::Link* high_contrast_;
   views::Link* dark_theme_;
   views::Link* learn_more_;
   views::Link* close_;
 
   DISALLOW_COPY_AND_ASSIGN(InvertBubbleView);
 };
 
 InvertBubbleView::InvertBubbleView(Browser* browser, views::View* anchor_view)
-    : views::BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT),
+    : views::BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       browser_(browser),
       high_contrast_(NULL),
       dark_theme_(NULL),
       learn_more_(NULL),
       close_(NULL) {
 }
 
 InvertBubbleView::~InvertBubbleView() {
 }
 
@@ skipping 47 matching lines @@
 
   // Switching to high-contrast mode has a nasty habit of causing Chrome
   // top-level windows to lose focus, so closing the bubble on deactivate
   // makes it disappear before the user has even seen it. This forces the
   // user to close it explicitly, which should be okay because it affects
   // a small minority of users, and only once.
   set_close_on_deactivate(false);
   set_move_with_anchor(true);
 }
 
-gfx::Rect InvertBubbleView::GetAnchorRect() {
-  // Set the height to 0 so we display the bubble at the top of the
-  // anchor rect.
-  gfx::Rect rect(BubbleDelegateView::GetAnchorRect());
-  rect.set_height(0);
-  return rect;
-}
-
 void InvertBubbleView::LinkClicked(views::Link* source, int event_flags) {
   if (source == high_contrast_)
     OpenLink(kHighContrastExtensionUrl, event_flags);
   else if (source == dark_theme_)
     OpenLink(kDarkThemeSearchUrl, event_flags);
   else if (source == learn_more_)
     OpenLink(kLearnMoreUrl, event_flags);
   else if (source == close_)
     GetWidget()->Close();
   else
     NOTREACHED();
 }
 
 void InvertBubbleView::OpenLink(const std::string& url, int event_flags) {
   WindowOpenDisposition disposition =
       ui::DispositionFromEventFlags(event_flags);
   content::OpenURLParams params(
       GURL(url), content::Referrer(),
       disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   browser_->OpenURL(params);
 }
 
 }  // namespace
 
 namespace chrome {
 
-void MaybeShowInvertBubbleView(Browser* browser, views::View* anchor_view) {
+void MaybeShowInvertBubbleView(BrowserView* browser_view) {
+  Browser* browser = browser_view->browser();
   PrefService* pref_service = browser->profile()->GetPrefs();
-  if (gfx::IsInvertedColorScheme() &&
+  views::View* anchor = browser_view->toolbar()->app_menu();
+  if (gfx::IsInvertedColorScheme() && anchor && anchor->GetWidget() &&
       !pref_service->GetBoolean(prefs::kInvertNotificationShown)) {
     pref_service->SetBoolean(prefs::kInvertNotificationShown, true);
-    InvertBubbleView* delegate = new InvertBubbleView(browser, anchor_view);
+    InvertBubbleView* delegate = new InvertBubbleView(browser, anchor);
     views::BubbleDelegateView::CreateBubble(delegate);
     delegate->StartFade(true);
   }
 }
 
 }  // namespace chrome