Alternate NTP: Move bookmark bar to bottom

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_string_conversions.h"
@@ skipping 26 matching lines @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #import "chrome/browser/ui/cocoa/view_resizer.h"
+#include "chrome/browser/ui/search/search.h"
+#include "chrome/browser/ui/search/search_ui.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
@@ skipping 192 matching lines @@
     delegate_ = delegate;
     resizeDelegate_ = resizeDelegate;
     folderTarget_.reset([[BookmarkFolderTarget alloc] initWithController:self]);
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     folderImage_.reset(
         rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).CopyNSImage());
     defaultImage_.reset(
         rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());
 
+    // Disable animations if the detached bookmark bar will be shown at the
+    // bottom of the new tab page.
+    if ([self shouldShowAtBottomWhenDetached])
+      ignoreAnimations_ = YES;
+
     // Register for theme changes, bookmark button pulsing, ...
     NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
     [defaultCenter addObserver:self
                       selector:@selector(themeDidChangeNotification:)
                           name:kBrowserThemeDidChangeNotification
                         object:nil];
     [defaultCenter addObserver:self
                       selector:@selector(pulseBookmarkNotification:)
                           name:bookmark_button::kPulseBookmarkButtonNotification
                         object:nil];
@@ skipping 199 matching lines @@
   [buttonView_ setFrame:buttonViewFrame];
 }
 
 // We don't change a preference; we only change visibility. Preference changing
 // (global state) is handled in |BrowserWindowCocoa::ToggleBookmarkBar()|. We
 // simply update based on what we're told.
 - (void)updateVisibility {
   [self showBookmarkBarWithAnimation:NO];
 }
 
+- (void)updateHiddenState {
+  BOOL oldHidden = [[self view] isHidden];
+  BOOL newHidden = ![self isVisible];
+  if (oldHidden != newHidden)
+    [[self view] setHidden:newHidden];
+}
+
+- (BOOL)shouldShowAtBottomWhenDetached {
+  return chrome::search::IsInstantExtendedAPIEnabled(browser_->profile());
+}
+
 - (void)setBookmarkBarEnabled:(BOOL)enabled {
   if (enabled != barIsEnabled_) {
     barIsEnabled_ = enabled;
     [self updateVisibility];
   }
 }
 
 - (CGFloat)getDesiredToolbarHeightCompression {
   // Some special cases....
   if (!barIsEnabled_)
@@ skipping 1783 matching lines @@
 // TODO(jrg): for now this is brute force.
 - (void)nodeChildrenReordered:(BookmarkModel*)model
                          node:(const BookmarkNode*)node {
   [self loaded:model];
 }
 
 #pragma mark BookmarkBarState Protocol
 
 // (BookmarkBarState protocol)
 - (BOOL)isVisible {
+  if ([self shouldShowAtBottomWhenDetached] &&
+      visualState_ == bookmarks::kDetachedState &&
+      [self currentTabContentsHeight] <
+              chrome::search::kMinContentHeightForBottomBookmarkBar) {

[Robert Sesek, 2012/12/04 17:05:58]

nit: over-indented. just indent 4 from '['

[sail, 2012/12/04 18:00:07]

Done.

+      return NO;
+  }
+
   return barIsEnabled_ && (visualState_ == bookmarks::kShowingState ||
                            visualState_ == bookmarks::kDetachedState ||
                            lastVisualState_ == bookmarks::kShowingState ||
                            lastVisualState_ == bookmarks::kDetachedState);
 }
 
 // (BookmarkBarState protocol)
 - (BOOL)isAnimationRunning {
   return lastVisualState_ != bookmarks::kInvalidState;
 }
@@ skipping 40 matching lines @@
   if ([self isAnimatingFromState:bookmarks::kDetachedState]) {
     return static_cast<CGFloat>(
         1 - [[self animatableView] currentAnimationProgress]);
   }
   return 0;
 }
 
 #pragma mark BookmarkBarToolbarViewController Protocol
 
 - (int)currentTabContentsHeight {
-  WebContents* wc = chrome::GetActiveWebContents(browser_);
-  return wc ? wc->GetView()->GetContainerSize().height() : 0;
+  BrowserWindowController* browserController =
+      [BrowserWindowController browserWindowControllerForView:[self view]];
+  return NSHeight([[browserController tabContentArea] frame]);
 }
 
 - (ui::ThemeProvider*)themeProvider {
   return ThemeServiceFactory::GetForProfile(browser_->profile());
 }
 
 #pragma mark BookmarkButtonDelegate Protocol
 
 - (void)fillPasteboard:(NSPasteboard*)pboard
        forDragOfButton:(BookmarkButton*)button {
@@ skipping 480 matching lines @@
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end