chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 1305143008: [Mac] Implement LocationBarViewMac::UpdateLocationBarVisibility()

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 1305143008: [Mac] Implement LocationBarViewMac::UpdateLocationBarVisibility() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Restoring popup windows to their original look Created 5 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.h » ('j') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

index 3417aa77227ed47eeaa62d5e80332d1840949ade..be1fea1676fee3381f616e54f0fa98b09146a5e0 100644

--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -29,6 +29,7 @@

#include "chrome/browser/translate/chrome_translate_client.h"

#include "chrome/browser/translate/translate_service.h"

#include "chrome/browser/ui/browser_list.h"

+#import "chrome/browser/ui/cocoa/browser_window_controller.h"

#import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"

#import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"

#import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"

@@ -46,6 +47,7 @@

#import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h"

#import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"

#import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"

+#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

#include "chrome/browser/ui/content_settings/content_setting_image_model.h"

#include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"

@@ -199,7 +201,14 @@ void LocationBarViewMac::UpdateBookmarkStarVisibility() {

void LocationBarViewMac::UpdateLocationBarVisibility(bool visible,

bool animate) {

- // Not implemented on Mac.

+ // The location bar is held within the toolbar, so its visibility is

+ // controlled by the visibility of the toolbar. In turn, the toolbar

+ // visibility is controlled by the BWC. If we have requested a visibility

+ // change, ask the BWC for the current view to tell the toolbar controller

+ // to update.

tapted 2015/10/26 04:40:55 This comment is a bit confusing. Perhaps just "To

dominickn 2015/10/26 06:42:42 Done.

+ [[[BrowserWindowController browserWindowControllerForView:field_]

+ toolbarController] updateVisibility:visible

+ withAnimation:animate];

}

bool LocationBarViewMac::ShowPageActionPopup(