patch for global error bubbles (view/gtk)

chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

 // Copyright (c) 2011 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/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/mac_util.h"
 #include "base/memory/singleton.h"
@@ skipping 23 matching lines @@
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #import "chrome/browser/ui/cocoa/menu_controller.h"
 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
+#include "chrome/browser/ui/global_error_delegate.h"
+#include "chrome/browser/ui/global_error_service.h"
+#include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_service.h"
@@ skipping 16 matching lines @@
 
 // The minimum width of the location bar in pixels.
 const CGFloat kMinimumLocationBarWidth = 100.0;
 
 // The duration of any animation that occurs within the toolbar in seconds.
 const CGFloat kAnimationDuration = 0.2;
 
 // The amount of left padding that the wrench menu should have.
 const CGFloat kWrenchMenuLeftPadding = 3.0;
 
+// The vertical offset of the wrench bubble from the wrench menu button.
+const CGFloat kWrenchBubblePointOffsetY = 6.0;
+
 }  // namespace
 
 @interface ToolbarController(Private)
 - (void)addAccessibilityDescriptions;
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(std::string*)prefName;
 - (BackgroundGradientView*)backgroundGradientView;
 - (void)toolbarFrameChanged;
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
 - (void)maintainMinimumLocationBarWidth;
@@ skipping 467 matching lines @@
 
 - (WrenchMenuController*)wrenchMenuController {
   return wrenchMenuController_;
 }
 
 - (void)badgeWrenchMenuIfNeeded {
   if (UpgradeDetector::GetInstance()->notify_upgrade()) {
     [[wrenchButton_ cell]
         setOverlayImageID:UpgradeDetector::GetInstance()->GetIconResourceID(
             UpgradeDetector::UPGRADE_ICON_TYPE_BADGE)];
-  } else {
-    [[wrenchButton_ cell] setOverlayImageID:0];
+    return;
   }
+
+  const std::vector<GlobalErrorDelegate*>& errors =
+      GlobalErrorServiceFactory::GetForProfile(
+          browser_->profile())->GetErrorDelegates();
+  for (std::vector<GlobalErrorDelegate*>::const_iterator
+       it = errors.begin(); it != errors.end(); ++it) {
+    GlobalErrorDelegate* error = *it;
+    if (error->HasBadge()) {
+      [[wrenchButton_ cell]
+          setOverlayImageID:error->GetBadgeResourceID()];
+      return;
+    }
+  }
+
+  [[wrenchButton_ cell] setOverlayImageID:0];
 }
 
 - (void)prefChanged:(std::string*)prefName {
   if (!prefName) return;
   if (*prefName == prefs::kShowHomeButton) {
     [self showOptionalHomeButton];
   }
 }
 
 - (void)createBrowserActionButtons {
@@ skipping 135 matching lines @@
   [NSAnimationContext beginGrouping];
   [[NSAnimationContext currentContext] setDuration:kAnimationDuration];
   [[locationBar_ animator] setFrame:locationFrame];
   [NSAnimationContext endGrouping];
 }
 
 - (NSPoint)bookmarkBubblePoint {
   return locationBarView_->GetBookmarkBubblePoint();
 }
 
+- (NSPoint)wrenchButtonBubblePoint {
+  NSRect bounds = [wrenchButton_ bounds];
+  NSPoint point =
+      NSMakePoint(NSMidX(bounds), NSMaxY(bounds) - kWrenchBubblePointOffsetY);
+  return [wrenchButton_ convertPoint:point toView:nil];
+}
+
 - (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight {
   // With no toolbar, just ignore the compression.
   return hasToolbar_ ? kBaseToolbarHeight - compressByHeight :
                        NSHeight([locationBar_ frame]);
 }
 
 - (void)setDividerOpacity:(CGFloat)opacity {
   BackgroundGradientView* view = [self backgroundGradientView];
   [view setShowsDivider:(opacity > 0 ? YES : NO)];
 
@@ skipping 61 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end