Integrate Chrome To Mobile with Action Box UI.

chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/chrome_to_mobile_service_factory.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/text/bytes_formatting.h"
 
 namespace {
 
 // The verical padding between the radio group and the send copy checkbox.
 const CGFloat kVerticalPadding = 10;
 
 // The duration of the "Sending..." progress throb animation in seconds.
@@ skipping 53 matching lines @@
     browser_ = browser;
     service_ = ChromeToMobileServiceFactory::GetForProfile(browser->profile());
   }
   return self;
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   // Instruct the service to delete the snapshot file.
   service_->DeleteSnapshot(snapshotPath_);
 
+  BrowserWindowController* controller = [BrowserWindowController
+      browserWindowControllerForWindow:self.parentWindow];
+  if (controller != nil) {

[sail, 2012/08/29 23:15:03]

you don't need this check, message calls to nil are no-ops

[msw, 2012/08/29 23:26:19]

Done.

+    // Restore the Action Box icon when the bubble closes.
+    [controller locationBarBridge]->SetActionBoxIcon(IDR_ACTION_BOX_BUTTON);
+    [controller chromeToMobileBubbleWindowWillClose];
+  }
+
   // We caught a close so we don't need to observe further notifications.
   bridge_.reset(NULL);
   [progressAnimation_ stopAnimation];
   // Cancel any delayed requests that may still be pending (close, etc.).
   [NSObject cancelPreviousPerformRequestsWithTarget:self];
   [super windowWillClose:notification];
 }
 
 // Override -[BaseBubbleController showWindow:] to set up UI elements.
 - (void)showWindow:(id)sender {
@@ skipping 33 matching lines @@
     [mobileRadioGroup_ setHidden:NO];
     [mobileRadioGroup_ sizeToCells];
 
     // Adjust the window size to accommodate the radio group.
     CGFloat deltaY = [mobileRadioGroup_ frame].size.height + kVerticalPadding;
     NSRect windowFrame = [window frame];
     windowFrame.size.height += deltaY;
     [window setFrame:windowFrame display:YES animate:NO];
   }
 
-  // Get the anchor point for the bubble in screen coordinates.
   BrowserWindowController* controller = [BrowserWindowController
       browserWindowControllerForWindow:self.parentWindow];
   if (controller != nil) {
+    // Get the anchor point for the bubble in screen coordinates.
     LocationBarViewMac* locationBar = [controller locationBarBridge];
-    NSPoint bubblePoint;
-    if (extensions::switch_utils::IsExtensionsInActionBoxEnabled()) {
-      bubblePoint = locationBar->GetActionBoxAnchorPoint();
-      bubblePoint = [self.parentWindow convertBaseToScreen:bubblePoint];
-      // Without an arrow, the anchor point of a bubble is the top left corner,
-      // but GetActionBoxAnchorPoint returns the top right corner.
-      bubblePoint.x -= self.bubble.frame.size.width;
-      [self.bubble setArrowLocation:info_bubble::kNoArrow];
-      [self.bubble setCornerFlags:info_bubble::kRoundedBottomCorners];
-      [self.bubble setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
-      [window setContentSize:self.bubble.frame.size];
-      [window setContentView:self.bubble];
-    } else {
-      bubblePoint = locationBar->GetChromeToMobileBubblePoint();
-      bubblePoint = [self.parentWindow convertBaseToScreen:bubblePoint];
-      [self.bubble setArrowLocation:info_bubble::kTopRight];
-    }
+    NSPoint bubblePoint = locationBar->GetActionBoxAnchorPoint();
+    bubblePoint = [self.parentWindow convertBaseToScreen:bubblePoint];
+    // Without an arrow, the anchor point of a bubble is the top left corner,
+    // but GetActionBoxAnchorPoint returns the top right corner.
+    bubblePoint.x -= self.bubble.frame.size.width;
+    [self.bubble setArrowLocation:info_bubble::kNoArrow];
+    [self.bubble setCornerFlags:info_bubble::kRoundedBottomCorners];
+    [self.bubble setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
+    [window setContentSize:self.bubble.frame.size];
+    [window setContentView:self.bubble];
     [self setAnchorPoint:bubblePoint];
+
+    // Show the lit Chrome To Mobile icon while the bubble is open.
+    locationBar->SetActionBoxIcon(IDR_MOBILE_LIT);
   }
 
   // Initialize the checkbox to send an offline copy.
   NSString* sendCopyString =
       l10n_util::GetNSStringF(IDS_CHROME_TO_MOBILE_BUBBLE_SEND_COPY,
           l10n_util::GetStringUTF16(
               IDS_CHROME_TO_MOBILE_BUBBLE_SEND_COPY_GENERATING));
   [sendCopy_ setTitle:sendCopyString];
   [sendCopy_ setState:NSOffState];
 
@@ skipping 123 matching lines @@
 
 - (void)setSendCopy:(bool)sendCopy {
   [sendCopy_ setState:(sendCopy ? NSOnState : NSOffState)];
 }
 
 - (ChromeToMobileBubbleNotificationBridge*)bridge {
   return bridge_.get();
 }
 
 @end  // ChromeToMobileBubbleController (JustForTesting)