Mac: fix/implement app windows (not app mode), popups, drawing; refactor code.

chrome/browser/cocoa/browser_window_cocoa.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.
 
 #include "app/l10n_util_mac.h"
 #include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 179 matching lines @@
   return gfx::Rect(NSRectToCGRect(tabRect));
 }
 
 void BrowserWindowCocoa::ConfirmAddSearchProvider(
     const TemplateURL* template_url,
     Profile* profile) {
   NOTIMPLEMENTED();
 }
 
 LocationBar* BrowserWindowCocoa::GetLocationBar() const {
-  return [controller_ locationBar];
+  return [controller_ locationBarBridge];
 }
 
 void BrowserWindowCocoa::SetFocusToLocationBar() {
   [controller_ focusLocationBar];
 }
 
 void BrowserWindowCocoa::UpdateStopGoState(bool is_loading, bool force) {
   [controller_ setIsLoading:is_loading ? YES : NO];
 }
 
 void BrowserWindowCocoa::UpdateToolbar(TabContents* contents,
                                        bool should_restore_state) {
   [controller_ updateToolbarWithContents:contents
                       shouldRestoreState:should_restore_state ? YES : NO];
 }
 
 void BrowserWindowCocoa::FocusToolbar() {
   NOTIMPLEMENTED();
 }
 
 bool BrowserWindowCocoa::IsBookmarkBarVisible() const {
   return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
 }
 
 bool BrowserWindowCocoa::IsToolbarVisible() const {
-  NOTIMPLEMENTED();
-  return true;
+  return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
+         browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
 }
 
 // This is called from Browser, which in turn is called directly from
 // a menu option.  All we do here is set a preference.  The act of
 // setting the preference sends notifications to all windows who then
 // know what to do.
 void BrowserWindowCocoa::ToggleBookmarkBar() {
   bookmark_utils::ToggleWhenVisible(browser_->profile());
 }
 
@@ skipping 271 matching lines @@
       break;
   }
 }
 
 void BrowserWindowCocoa::DestroyBrowser() {
   [controller_ destroyBrowser];
 
   // at this point the controller is dead (autoreleased), so
   // make sure we don't try to reference it any more.
 }