OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <numeric> | 8 #include <numeric> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1544 bookmarkBubbleObserver_.reset(new BookmarkBubbleObserverCocoa(self)); | 1544 bookmarkBubbleObserver_.reset(new BookmarkBubbleObserverCocoa(self)); |
1545 | 1545 |
1546 if (chrome::ToolkitViewsDialogsEnabled()) { | 1546 if (chrome::ToolkitViewsDialogsEnabled()) { |
1547 chrome::ShowBookmarkBubbleViewsAtPoint( | 1547 chrome::ShowBookmarkBubbleViewsAtPoint( |
1548 gfx::ScreenPointFromNSPoint(ui::ConvertPointFromWindowToScreen( | 1548 gfx::ScreenPointFromNSPoint(ui::ConvertPointFromWindowToScreen( |
1549 [self window], [self bookmarkBubblePoint])), | 1549 [self window], [self bookmarkBubblePoint])), |
1550 [[self window] contentView], bookmarkBubbleObserver_.get(), | 1550 [[self window] contentView], bookmarkBubbleObserver_.get(), |
1551 browser_.get(), url, alreadyMarked); | 1551 browser_.get(), url, alreadyMarked); |
1552 } else { | 1552 } else { |
1553 BookmarkModel* model = | 1553 BookmarkModel* model = |
1554 BookmarkModelFactory::GetForProfile(browser_->profile()); | 1554 BookmarkModelFactory::GetForBrowserContext(browser_->profile()); |
1555 bookmarks::ManagedBookmarkService* managed = | 1555 bookmarks::ManagedBookmarkService* managed = |
1556 ManagedBookmarkServiceFactory::GetForProfile(browser_->profile()); | 1556 ManagedBookmarkServiceFactory::GetForProfile(browser_->profile()); |
1557 const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url); | 1557 const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url); |
1558 bookmarkBubbleController_ = [[BookmarkBubbleController alloc] | 1558 bookmarkBubbleController_ = [[BookmarkBubbleController alloc] |
1559 initWithParentWindow:[self window] | 1559 initWithParentWindow:[self window] |
1560 bubbleObserver:bookmarkBubbleObserver_.get() | 1560 bubbleObserver:bookmarkBubbleObserver_.get() |
1561 managed:managed | 1561 managed:managed |
1562 model:model | 1562 model:model |
1563 node:node | 1563 node:node |
1564 alreadyBookmarked:alreadyMarked]; | 1564 alreadyBookmarked:alreadyMarked]; |
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2055 | 2055 |
2056 - (NSRect)savedRegularWindowFrame { | 2056 - (NSRect)savedRegularWindowFrame { |
2057 return savedRegularWindowFrame_; | 2057 return savedRegularWindowFrame_; |
2058 } | 2058 } |
2059 | 2059 |
2060 - (BOOL)isFullscreenTransitionInProgress { | 2060 - (BOOL)isFullscreenTransitionInProgress { |
2061 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2061 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
2062 } | 2062 } |
2063 | 2063 |
2064 @end // @implementation BrowserWindowController(WindowType) | 2064 @end // @implementation BrowserWindowController(WindowType) |
OLD | NEW |