chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h - Issue 2845593002: Updates Zoom bubble layout and adds +/- buttons

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 2845593002: Updates Zoom bubble layout and adds +/- buttons (Closed)

Patch Set: Fix ZoomController to never show the bubble when zoom level is not changed from default 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

« no previous file with comments | « chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | chrome/browser/ui/views/location_bar/zoom_bubble_view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_	5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_

6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_	6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_

7	7

8 #import <Cocoa/Cocoa.h>	8 #import <Cocoa/Cocoa.h>

9 #include <stddef.h>	9 #include <stddef.h>

10	10

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 GURL GetDestinationURL() const override;	62 GURL GetDestinationURL() const override;

63 WindowOpenDisposition GetWindowOpenDisposition() const override;	63 WindowOpenDisposition GetWindowOpenDisposition() const override;

64 ui::PageTransition GetPageTransition() const override;	64 ui::PageTransition GetPageTransition() const override;

65 void AcceptInput() override;	65 void AcceptInput() override;

66 void FocusLocation(bool select_all) override;	66 void FocusLocation(bool select_all) override;

67 void FocusSearch() override;	67 void FocusSearch() override;

68 void UpdateContentSettingsIcons() override;	68 void UpdateContentSettingsIcons() override;

69 void UpdateManagePasswordsIconAndBubble() override;	69 void UpdateManagePasswordsIconAndBubble() override;

70 void UpdateSaveCreditCardIcon() override;	70 void UpdateSaveCreditCardIcon() override;

71 void UpdateBookmarkStarVisibility() override;	71 void UpdateBookmarkStarVisibility() override;

	72 void UpdateZoomViewVisibility() override;

72 void UpdateLocationBarVisibility(bool visible, bool animate) override;	73 void UpdateLocationBarVisibility(bool visible, bool animate) override;

73 void SaveStateToContents(content::WebContents* contents) override;	74 void SaveStateToContents(content::WebContents* contents) override;

74 void Revert() override;	75 void Revert() override;

75 const OmniboxView* GetOmniboxView() const override;	76 const OmniboxView* GetOmniboxView() const override;

76 OmniboxView* GetOmniboxView() override;	77 OmniboxView* GetOmniboxView() override;

77 LocationBarTesting* GetLocationBarForTesting() override;	78 LocationBarTesting* GetLocationBarForTesting() override;

78	79

79 // Overridden from LocationBarTesting:	80 // Overridden from LocationBarTesting:

80 bool GetBookmarkStarVisibility() override;	81 bool GetBookmarkStarVisibility() override;

81 bool TestContentSettingImagePressed(size_t index) override;	82 bool TestContentSettingImagePressed(size_t index) override;

(...skipping 216 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
298 // The security level of the location bar icon.	299 // The security level of the location bar icon.

299 security_state::SecurityLevel security_level_;	300 security_state::SecurityLevel security_level_;

300	301

301 // Used to schedule a task for the first run info bubble.	302 // Used to schedule a task for the first run info bubble.

302 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;	303 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;

303	304

304 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);	305 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);

305 };	306 };

306	307

307 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_	308 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_

OLD	NEW