Sidebar view, implementation for Mac.

chrome/browser/cocoa/tab_strip_controller.mm

 // Copyright (c) 2010 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/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <limits>
 #include <string>
@@ skipping 13 matching lines @@
 #import "chrome/browser/cocoa/constrained_window_mac.h"
 #import "chrome/browser/cocoa/new_tab_button.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_contents_controller.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/cocoa/throbber_view.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/sidebar/sidebar_container.h"
+#include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
@@ skipping 995 matching lines @@
       [tabContentsArray_ objectAtIndex:index];
   [newController willBecomeSelectedTab];
 
   // Relayout for new tabs and to let the selected tab grow to be larger in
   // size than surrounding tabs if the user has many. This also raises the
   // selected tab to the top.
   [self layoutTabs];
 
   // Swap in the contents for the new tab.
   [self swapInTabAtIndex:modelIndex];
+  [self updateSidebarForContents:newContents];
   [self updateDevToolsForContents:newContents];
 
   if (newContents) {
     newContents->DidBecomeSelected();
     newContents->view()->RestoreFocus();
 
     if (newContents->find_ui_active())
       browser_->GetFindBarController()->find_bar()->SetFocusAndSelection();
   }
 }
@@ skipping 87 matching lines @@
 
   TabController* tab = [tabArray_ objectAtIndex:index];
   if (tabStripModel_->count() > 0) {
     [self startClosingTabWithAnimation:tab];
     [self layoutTabs];
   } else {
     [self removeTab:tab];
   }
 
   // Does nothing, purely for consistency with the windows/linux code.
+  [self updateSidebarForContents:NULL];
   [self updateDevToolsForContents:NULL];
 
   // Send a broadcast that the number of tabs have changed.
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kTabStripNumberOfTabsChanged
                     object:self];
 }
 
 // A helper routine for creating an NSImageView to hold the fav icon or app icon
 // for |contents|.
@@ skipping 615 matching lines @@
 }
 
 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window {
   // TODO(thakis, avi): Figure out how to make this work when tabs are dragged
   // out or if fullscreen mode is toggled.
 
   // View hierarchy of the contents view:
   // NSView  -- switchView, same for all tabs
   // +-  NSView  -- TabContentsController's view
   //     +- NSSplitView
-  //        +- TabContentsViewCocoa
+  //        +- NSSplitView
+  //           +- TabContentsViewCocoa
   // We use the TabContentsController's view in |swapInTabAtIndex|, so we have
   // to pass it to the sheet controller here.
   NSView* tabContentsView =
-      [[window->owner()->GetNativeView() superview] superview];
+      [[[window->owner()->GetNativeView() superview] superview] superview];
   window->delegate()->RunSheet([self sheetController], tabContentsView);
 
   // TODO(avi, thakis): GTMWindowSheetController has no api to move tabsheets
   // between windows. Until then, we have to prevent having to move a tabsheet
   // between windows, e.g. no tearing off of tabs.
   NSInteger modelIndex = [self modelIndexForContentsView:tabContentsView];
   NSInteger index = [self indexFromModelIndex:modelIndex];
   BrowserWindowController* controller =
       (BrowserWindowController*)[[switchView_ window] windowController];
   DCHECK(controller != nil);
   DCHECK(index >= 0);
   if (index >= 0) {
     [controller setTab:[self viewAtIndex:index] isDraggable:NO];
   }
 }
 
 - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window {
   NSView* tabContentsView =
-      [[window->owner()->GetNativeView() superview] superview];
+      [[[window->owner()->GetNativeView() superview] superview] superview];
 
   // TODO(avi, thakis): GTMWindowSheetController has no api to move tabsheets
   // between windows. Until then, we have to prevent having to move a tabsheet
   // between windows, e.g. no tearing off of tabs.
   NSInteger modelIndex = [self modelIndexForContentsView:tabContentsView];
   NSInteger index = [self indexFromModelIndex:modelIndex];
   BrowserWindowController* controller =
       (BrowserWindowController*)[[switchView_ window] windowController];
   DCHECK(index >= 0);
   if (index >= 0) {
@@ skipping 14 matching lines @@
   if (index < 0 || index >= (NSInteger)[tabContentsArray_ count])
     return;
 
   TabContentsController* tabController =
       [tabContentsArray_ objectAtIndex:index];
   TabContents* devtoolsContents = contents ?
       DevToolsWindow::GetDevToolsContents(contents) : NULL;
   [tabController showDevToolsContents:devtoolsContents];
 }
 
+// This function is very similar to updateDevToolsContents.
+// TODO(alekseys): refactor and move both to browser window.
+// I (alekseys) intend to do it very soon.
+- (void)updateSidebarForContents:(TabContents*)contents {
+  if (SidebarManager::GetInstance() == NULL)  // Happens in tests.
+    return;
+
+  int modelIndex = tabStripModel_->GetIndexOfTabContents(contents);
+
+  // This happens e.g. if one hits cmd-q with sidebar expanded.
+  if (modelIndex == TabStripModel::kNoTab)
+    return;
+
+  NSInteger index = [self indexFromModelIndex:modelIndex];
+  DCHECK_GE(index, 0);
+  DCHECK_LT(index, (NSInteger)[tabContentsArray_ count]);
+  if (index < 0 || index >= (NSInteger)[tabContentsArray_ count])
+    return;
+
+  TabContentsController* tabController =
+      [tabContentsArray_ objectAtIndex:index];
+  TabContents* sidebar_contents = NULL;
+  if (contents && SidebarManager::IsSidebarAllowed()) {
+    SidebarContainer* active_sidebar =
+        SidebarManager::GetInstance()->GetActiveSidebarContainerFor(contents);
+    if (active_sidebar)
+      sidebar_contents = active_sidebar->sidebar_contents();
+  }
+  TabContents* old_sidebar_contents = [tabController sidebarContents];
+  [tabController showSidebarContents:sidebar_contents];
+  SidebarManager::GetInstance()->NotifyStateChanges(
+      old_sidebar_contents, sidebar_contents);
+}
+
 @end