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"
@@ skipping 128 matching lines @@
     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) {
     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];
   }
 
   // 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 124 matching lines @@
 
 - (void)setSendCopy:(bool)sendCopy {
   [sendCopy_ setState:(sendCopy ? NSOnState : NSOffState)];
 }
 
 - (ChromeToMobileBubbleNotificationBridge*)bridge {
   return bridge_.get();
 }
 
 @end  // ChromeToMobileBubbleController (JustForTesting)