Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1412)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 2882533003: [Mac] Hover/Active Omnibox Icon States for Secondary UI MD (Closed)
Patch Set: Addressed tapted's comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" 60 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
61 #import "chrome/browser/ui/cocoa/framed_browser_window.h" 61 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
62 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h" 62 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h"
63 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_c ontroller.h" 63 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_c ontroller.h"
64 #include "chrome/browser/ui/cocoa/fullscreen_low_power_coordinator.h" 64 #include "chrome/browser/ui/cocoa/fullscreen_low_power_coordinator.h"
65 #import "chrome/browser/ui/cocoa/fullscreen_window.h" 65 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
66 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 66 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
67 #include "chrome/browser/ui/cocoa/l10n_util.h" 67 #include "chrome/browser/ui/cocoa/l10n_util.h"
68 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" 68 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
69 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 69 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
70 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
70 #include "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.h" 71 #include "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.h"
71 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" 72 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
72 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" 73 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
73 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" 74 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
74 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" 75 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
75 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 76 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
76 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" 77 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
77 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" 78 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
78 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 79 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
79 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 80 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
(...skipping 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 if (bookmarkBubbleObserver_.get()) 1577 if (bookmarkBubbleObserver_.get())
1577 return; 1578 return;
1578 1579
1579 bookmarkBubbleObserver_.reset(new BookmarkBubbleObserverCocoa(self)); 1580 bookmarkBubbleObserver_.reset(new BookmarkBubbleObserverCocoa(self));
1580 1581
1581 if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { 1582 if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
1582 chrome::ShowBookmarkBubbleViewsAtPoint( 1583 chrome::ShowBookmarkBubbleViewsAtPoint(
1583 gfx::ScreenPointFromNSPoint(ui::ConvertPointFromWindowToScreen( 1584 gfx::ScreenPointFromNSPoint(ui::ConvertPointFromWindowToScreen(
1584 [self window], [self bookmarkBubblePoint])), 1585 [self window], [self bookmarkBubblePoint])),
1585 [[self window] contentView], bookmarkBubbleObserver_.get(), 1586 [[self window] contentView], bookmarkBubbleObserver_.get(),
1586 browser_.get(), url, alreadyMarked); 1587 browser_.get(), url, alreadyMarked,
1588 [self locationBarBridge]->star_decoration());
1587 } else { 1589 } else {
1588 BookmarkModel* model = 1590 BookmarkModel* model =
1589 BookmarkModelFactory::GetForBrowserContext(browser_->profile()); 1591 BookmarkModelFactory::GetForBrowserContext(browser_->profile());
1590 bookmarks::ManagedBookmarkService* managed = 1592 bookmarks::ManagedBookmarkService* managed =
1591 ManagedBookmarkServiceFactory::GetForProfile(browser_->profile()); 1593 ManagedBookmarkServiceFactory::GetForProfile(browser_->profile());
1592 const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url); 1594 const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url);
1593 bookmarkBubbleController_ = [[BookmarkBubbleController alloc] 1595 bookmarkBubbleController_ = [[BookmarkBubbleController alloc]
1594 initWithParentWindow:[self window] 1596 initWithParentWindow:[self window]
1595 bubbleObserver:bookmarkBubbleObserver_.get() 1597 bubbleObserver:bookmarkBubbleObserver_.get()
1596 managed:managed 1598 managed:managed
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
2087 2089
2088 - (NSRect)savedRegularWindowFrame { 2090 - (NSRect)savedRegularWindowFrame {
2089 return savedRegularWindowFrame_; 2091 return savedRegularWindowFrame_;
2090 } 2092 }
2091 2093
2092 - (BOOL)isFullscreenTransitionInProgress { 2094 - (BOOL)isFullscreenTransitionInProgress {
2093 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; 2095 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_;
2094 } 2096 }
2095 2097
2096 @end // @implementation BrowserWindowController(WindowType) 2098 @end // @implementation BrowserWindowController(WindowType)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698