mac: Plumbing for the emoji font.

chrome/browser/ui/cocoa/web_intent_sheet_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/web_intent_sheet_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 1089 matching lines @@
   // Keep the new subviews in an array that gets replaced at the end.
   NSMutableArray* subviews = [NSMutableArray array];
 
   // Indicator that we have neither suggested nor installed services,
   // and we're not in the wait stage any more either.
   BOOL isEmpty = model_ &&
       !model_->IsWaitingForSuggestions() &&
       !model_->GetInstalledServiceCount() &&
       !model_->GetSuggestedExtensionCount();
 
-  if (model_ && model_->IsWaitingForSuggestions()) {
+  if (model_) {// && model_->IsWaitingForSuggestions()) {

[falken, 2012/10/05 05:40:47]

I think we can't have commented out code, right?

[Nico, 2012/10/05 05:41:34]

Whoops, that's unrelated anyway. Reverted this file, thanks!

     if (!waitingView_.get())
       waitingView_.reset([[WaitingView alloc] init]);
     [subviews addObject:waitingView_];
     offset += NSHeight([waitingView_ frame]);
   } else if (isEmpty) {
     scoped_nsobject<NSView> emptyView([self createEmptyView]);
     [subviews addObject:emptyView];
     offset += NSHeight([emptyView frame]);
   } else if (contents_) {
     offset += [self addAnotherServiceLinkToSubviews:subviews
@@ skipping 60 matching lines @@
 - (void)stopThrobber {
   [closeButton_ setEnabled:YES];
   [intentView_ stopThrobber];
 }
 
 - (void)closeSheet {
   [NSApp endSheet:[self window]];
 }
 
 @end  // WebIntentPickerSheetController