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

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 "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
@@ skipping 131 matching lines @@
      resizeDelegate:(id<ViewResizer>)resizeDelegate {
   DCHECK(model && commands && profile);
   if ((self = [super initWithNibName:@"Toolbar"
                               bundle:mac_util::MainAppBundle()])) {
     toolbarModel_ = model;
     commands_ = commands;
     profile_ = profile;
     browser_ = browser;
     resizeDelegate_ = resizeDelegate;
     hasToolbar_ = YES;
+    hasLocationBar_ = YES;
 
     // Register for notifications about state changes for the toolbar buttons
     commandObserver_.reset(new CommandObserverBridge(self, commands));
     commandObserver_->ObserveCommand(IDC_BACK);
     commandObserver_->ObserveCommand(IDC_FORWARD);
     commandObserver_->ObserveCommand(IDC_RELOAD);
     commandObserver_->ObserveCommand(IDC_HOME);
     commandObserver_->ObserveCommand(IDC_BOOKMARK_PAGE);
   }
   return self;
 }
 
 - (void)dealloc {
   // Make sure any code in the base class which assumes [self view] is
   // the "parent" view continues to work.
   hasToolbar_ = YES;
+  hasLocationBar_ = YES;
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   if (trackingArea_.get())
     [[self view] removeTrackingArea:trackingArea_.get()];
   [super dealloc];
 }
 
 // Called after the view is done loading and the outlets have been hooked up.
 // Now we can hook up bridges that rely on UI objects such as the location
@@ skipping 108 matching lines @@
     [[targetView cell] setMouseInside:YES animate:YES];
     [hoveredButton_ release];
     hoveredButton_ = [targetView retain];
   }
 }
 
 - (void)mouseEntered:(NSEvent*)event {
   [self mouseMoved:event];
 }
 
-- (LocationBar*)locationBar {
+- (LocationBar*)locationBarBridge {
   return locationBarView_.get();
 }
 
 - (void)focusLocationBar {
   if (locationBarView_.get()) {
     locationBarView_->FocusLocation();
   }
 }
 
 // Called when the state for a command changes to |enabled|. Update the
@@ skipping 63 matching lines @@
   NSInteger tag = IDC_GO;
   if (isLoading) {
     imageName = kGoButtonStopImageName;
     tag = IDC_STOP;
   }
   NSImage* stopStartImage = nsimage_cache::ImageNamed(imageName);
   [goButton_ setImage:stopStartImage];
   [goButton_ setTag:tag];
 }
 
-- (void)setHasToolbar:(BOOL)toolbar {
-  [self view];  // force nib loading
+- (void)setHasToolbar:(BOOL)toolbar hasLocationBar:(BOOL)locBar {
+  [self view];  // Force nib loading.
+
   hasToolbar_ = toolbar;
 
-  // App mode allows turning off the location bar as well.
-  // TODO(???): add more code here when implementing app mode to allow
-  // turning off both toolbar AND location bar.
+  // If there's a toolbar, there must be a location bar.
+  DCHECK((toolbar && locBar) || !toolbar);
+  hasLocationBar_ = toolbar ? YES : locBar;
+
+  // Decide whether to hide/show based on whether there's a location bar.
+  [[self view] setHidden:!hasLocationBar_];
 
   // Make location bar not editable when in a pop-up.
+  // TODO(viettrungluu): is this right (all the time)?
   [locationBar_ setEditable:toolbar];
 }
 
 - (NSView*)view {
   if (hasToolbar_)
     return [super view];
   return locationBar_;
 }
 
 // (Private) Returns the backdrop to the toolbar.
@@ skipping 176 matching lines @@
   locationFrame.size.width += dX;
   [locationBar_ setFrame:locationFrame];
 }
 
 - (NSRect)starButtonInWindowCoordinates {
   return [[[starButton_ window] contentView] convertRect:[starButton_ bounds]
                                                 fromView:starButton_];
 }
 
 - (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight {
-  return kBaseToolbarHeight - compressByHeight;
+  // With no toolbar, just ignore the compression.
+  return hasToolbar_ ? kBaseToolbarHeight - compressByHeight :
+                       NSHeight([locationBar_ frame]);
 }
 
 - (void)setDividerOpacity:(CGFloat)opacity {
   BackgroundGradientView* view = [self backgroundGradientView];
   [view setShowsDivider:(opacity > 0 ? YES : NO)];
 
   // We may not have a toolbar view (e.g., popup windows only have a location
   // bar).
   if ([view isKindOfClass:[ToolbarView class]]) {
     ToolbarView* toolbarView = (ToolbarView*)view;
@@ skipping 10 matching lines @@
   // Following chrome/browser/views/go_button.cc: GoButton::GetTooltipText()
 
   // Is it currently 'stop'?
   if ([goButton_ tag] == IDC_STOP) {
     return l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STOP);
   }
 
   // It is 'go', so see what it would do...
 
   // Fetch the EditView and EditModel
-  LocationBar* locationBar = [self locationBar];
+  LocationBar* locationBar = [self locationBarBridge];
   DCHECK(locationBar);
   AutocompleteEditView* editView = locationBar->location_entry();
   DCHECK(editView);
   AutocompleteEditModel* editModel = editView->model();
   DCHECK(editModel);
 
   std::wstring currentText(editView->GetText());
   if (currentText.empty()) {
     return nil;
   }
@@ skipping 38 matching lines @@
 
   NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
                         NSHeight(locationFrame));
   gfx::Rect stack_bounds(
       NSRectToCGRect([[self view] convertRect:r toView:nil]));
   // Inset the bounds to just inside the visible edges (see comment above).
   stack_bounds.Inset(kLocationStackEdgeWidth, 0);
   return stack_bounds;
 }
 @end