Integrate Chrome To Mobile with Action Box UI.

chrome/browser/ui/cocoa/browser_window_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/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 59 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h"
 
 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
 // (in order):
 // 1. Interfaces. Very short, one-time-use classes may include an implementation
 //    immediately after their interface.
 // 2. The general implementation section, ordered as follows:
@@ skipping 1551 matching lines @@
 - (void)bookmarkBubbleWindowWillClose:(NSNotification*)notification {
   DCHECK_EQ([notification object], [bookmarkBubbleController_ window]);
 
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center removeObserver:self
                     name:NSWindowWillCloseNotification
                   object:[bookmarkBubbleController_ window]];
   bookmarkBubbleController_ = nil;
 }
 
-- (NSPoint)chromeToMobileBubblePoint {
-  return [toolbarController_ chromeToMobileBubblePoint];
-}
-
 // Show the Chrome To Mobile bubble (e.g. user just clicked on the icon).
 - (void)showChromeToMobileBubble {
   // Do nothing if the bubble is already showing.
   if (chromeToMobileBubbleController_)
     return;
 
   chromeToMobileBubbleController_ =
       [[ChromeToMobileBubbleController alloc]
           initWithParentWindow:[self window]
                        browser:browser_.get()];
   [chromeToMobileBubbleController_ showWindow:self];
 
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center addObserver:self
              selector:@selector(chromeToMobileBubbleWindowWillClose:)
                  name:NSWindowWillCloseNotification
                object:[chromeToMobileBubbleController_ window]];

[sail, 2012/08/29 22:29:51]

can you add a DCHECK() for window. If this is ever nil we'll get notifications
for all windows

actually, i think it would be even better to do this within
-[ChromeToMobileBubbleController showWindow:] and
-[ChromeToMobileBubbleController windowWillClose].

You're already using BrowserWindowController in that code so it should be easy
to switch.

[msw, 2012/08/29 23:11:57]

Done (moved to ChromeToMobileBubbleController showWindow).

   // Show the lit Chrome To Mobile icon while the bubble is visible.
-  [self locationBarBridge]->SetChromeToMobileDecorationLit(true);
+  [self locationBarBridge]->SetActionBoxIcon(IDR_MOBILE_LIT);
 }
 
 // Nil out the weak Chrome To Mobile bubble controller reference.
 - (void)chromeToMobileBubbleWindowWillClose:(NSNotification*)notification {
   DCHECK_EQ([notification object], [chromeToMobileBubbleController_ window]);
 
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center removeObserver:self
                     name:NSWindowWillCloseNotification
                   object:[chromeToMobileBubbleController_ window]];

[sail, 2012/08/29 22:29:51]

same, need DCHECK

[msw, 2012/08/29 23:11:57]

Done (moved to ChromeToMobileBubbleController windowWillClose).

   chromeToMobileBubbleController_ = nil;
-  // Restore the dimmed Chrome To Mobile icon when the bubble closes.
-  [self locationBarBridge]->SetChromeToMobileDecorationLit(false);
+  // Restore the Action Box icon when the bubble closes.
+  [self locationBarBridge]->SetActionBoxIcon(IDR_ACTION_BOX_BUTTON);
 }
 
 // Handle the editBookmarkNode: action sent from bookmark bubble controllers.
 - (void)editBookmarkNode:(id)sender {
   BOOL responds = [sender respondsToSelector:@selector(node)];
   DCHECK(responds);
   if (responds) {
     const BookmarkNode* node = [sender node];
     if (node)
       BookmarkEditor::Show([self window], browser_->profile(),
@@ skipping 520 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)