OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #import "base/memory/scoped_nsobject.h" | 10 #import "base/memory/scoped_nsobject.h" |
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 | 855 |
856 barVisibilityUpdatesEnabled_ = NO; | 856 barVisibilityUpdatesEnabled_ = NO; |
857 [presentationModeController_ cancelAnimationAndTimers]; | 857 [presentationModeController_ cancelAnimationAndTimers]; |
858 } | 858 } |
859 | 859 |
860 - (CGFloat)toolbarDividerOpacity { | 860 - (CGFloat)toolbarDividerOpacity { |
861 return [bookmarkBarController_ toolbarDividerOpacity]; | 861 return [bookmarkBarController_ toolbarDividerOpacity]; |
862 } | 862 } |
863 | 863 |
864 - (browser_window_controller::InstantUIState)currentInstantUIState { | 864 - (browser_window_controller::InstantUIState)currentInstantUIState { |
865 if (!browser_->search_model()->mode().is_search_suggestions()) | 865 if (!browser_->search_model()->mode().is_search()) |
866 return browser_window_controller::kInstantUINone; | 866 return browser_window_controller::kInstantUINone; |
867 | 867 |
868 // If the search suggestions are already being displayed in the overlay | 868 // If the search suggestions are already being displayed in the overlay |
869 // contents then return kInstantUIOverlay. | 869 // contents then return kInstantUIOverlay. |
870 if ([overlayableContentsController_ isShowingOverlay]) | 870 if ([overlayableContentsController_ isShowingOverlay]) |
871 return browser_window_controller::kInstantUIOverlay; | 871 return browser_window_controller::kInstantUIOverlay; |
872 | 872 |
873 if (browser_->search_model()->top_bars_visible()) | 873 if (browser_->search_model()->top_bars_visible()) |
874 return browser_window_controller::kInstantUINone; | 874 return browser_window_controller::kInstantUINone; |
875 | 875 |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
990 relativeTo:[bookmarkBarController_ view]]; | 990 relativeTo:[bookmarkBarController_ view]]; |
991 } else { | 991 } else { |
992 [contentView cr_ensureSubview:floatingBarBackingView_ | 992 [contentView cr_ensureSubview:floatingBarBackingView_ |
993 isPositioned:NSWindowBelow | 993 isPositioned:NSWindowBelow |
994 relativeTo:[bookmarkBarController_ view]]; | 994 relativeTo:[bookmarkBarController_ view]]; |
995 } | 995 } |
996 } | 996 } |
997 } | 997 } |
998 | 998 |
999 @end // @implementation BrowserWindowController(Private) | 999 @end // @implementation BrowserWindowController(Private) |
OLD | NEW |