[Mac] Use the ExtensionToolbarModel for ordering of the Browser Actions. Prep...

chrome/browser/cocoa/toolbar_controller.mm

 // Copyright (c) 2009 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/cocoa/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
@@ skipping 459 matching lines @@
   return (BackgroundGradientView*)[super view];
 }
 
 - (id)customFieldEditorForObject:(id)obj {
   if (obj == locationBar_) {
     // Lazilly construct Field editor, Cocoa UI code always runs on the
     // same thread, so there shoudn't be a race condition here.
     if (autocompleteTextFieldEditor_.get() == nil) {
       autocompleteTextFieldEditor_.reset(
           [[AutocompleteTextFieldEditor alloc] init]);
+      [autocompleteTextFieldEditor_ setProfile:profile_];
     }
 
     // This needs to be called every time, otherwise notifications
     // aren't sent correctly.
     DCHECK(autocompleteTextFieldEditor_.get());
     [autocompleteTextFieldEditor_.get() setFieldEditor:YES];
     return autocompleteTextFieldEditor_.get();
   }
   return nil;
 }
@@ skipping 331 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end