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

Side by Side Diff: chrome/browser/ui/views/location_bar/zoom_bubble_view.h

Issue 2845593002: Updates Zoom bubble layout and adds +/- buttons (Closed)
Patch Set: Updates Zoom bubble layout and adds +/- buttons (vector images) 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 (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_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 base::OneShotTimer timer_; 120 base::OneShotTimer timer_;
121 121
122 // Image button in the zoom bubble that will show the |extension_icon_| image 122 // Image button in the zoom bubble that will show the |extension_icon_| image
123 // if an extension initiated the zoom change, and links to that extension at 123 // if an extension initiated the zoom change, and links to that extension at
124 // "chrome://extensions". 124 // "chrome://extensions".
125 views::ImageButton* image_button_; 125 views::ImageButton* image_button_;
126 126
127 // Label displaying the zoom percentage. 127 // Label displaying the zoom percentage.
128 views::Label* label_; 128 views::Label* label_;
129 129
130 // Action buttons that can change zoom.
131 views::ImageButton* zoom_out_button_;
132 views::ImageButton* zoom_in_button_;
133 views::Button* reset_button_;
134
130 // The WebContents for the page whose zoom has changed. 135 // The WebContents for the page whose zoom has changed.
131 content::WebContents* web_contents_; 136 content::WebContents* web_contents_;
132 137
133 // Whether the currently displayed bubble will automatically close. 138 // Whether the currently displayed bubble will automatically close.
134 bool auto_close_; 139 bool auto_close_;
135 140
141 // True when handling a button click event.
142 bool ignore_close_bubble_;
143
136 // The immersive mode controller for the BrowserView containing 144 // The immersive mode controller for the BrowserView containing
137 // |web_contents_|. 145 // |web_contents_|.
138 // Not owned. 146 // Not owned.
139 ImmersiveModeController* immersive_mode_controller_; 147 ImmersiveModeController* immersive_mode_controller_;
140 148
141 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView); 149 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView);
142 }; 150 };
143 151
144 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 152 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698