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

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

Issue 301733006: Zoom Extension API (chrome) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Create ZoomController for guest web contents. Created 6 years, 6 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 | Annotate | Revision Log
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 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" 5 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/strings/stringprintf.h"
8 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/chrome_page_zoom.h" 10 #include "chrome/browser/chrome_page_zoom.h"
10 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_finder.h" 12 #include "chrome/browser/ui/browser_finder.h"
13 #include "chrome/browser/ui/browser_tabstrip.h"
12 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
13 #include "chrome/browser/ui/views/frame/browser_view.h" 15 #include "chrome/browser/ui/views/frame/browser_view.h"
14 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
15 #include "chrome/browser/ui/views/location_bar/zoom_view.h" 17 #include "chrome/browser/ui/views/location_bar/zoom_view.h"
16 #include "chrome/browser/ui/zoom/zoom_controller.h" 18 #include "chrome/browser/ui/zoom/zoom_controller.h"
19 #include "chrome/common/extensions/api/extension_action/action_info.h"
17 #include "content/public/browser/notification_source.h" 20 #include "content/public/browser/notification_source.h"
21 #include "extensions/common/manifest_handlers/icons_handler.h"
18 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 #include "grit/theme_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/favicon_size.h"
27 #include "ui/views/controls/button/image_button.h"
21 #include "ui/views/controls/button/label_button.h" 28 #include "ui/views/controls/button/label_button.h"
22 #include "ui/views/controls/separator.h" 29 #include "ui/views/controls/separator.h"
23 #include "ui/views/layout/box_layout.h" 30 #include "ui/views/layout/grid_layout.h"
24 #include "ui/views/layout/layout_constants.h" 31 #include "ui/views/layout/layout_constants.h"
25 #include "ui/views/widget/widget.h" 32 #include "ui/views/widget/widget.h"
26 33
27 namespace { 34 namespace {
28 35
29 // The number of milliseconds the bubble should stay on the screen if it will 36 // The number of milliseconds the bubble should stay on the screen if it will
30 // close automatically. 37 // close automatically.
31 const int kBubbleCloseDelay = 1500; 38 const int kBubbleCloseDelay = 1500;
32 39
33 // The bubble's padding from the screen edge, used in fullscreen. 40 // The bubble's padding from the screen edge, used in fullscreen.
(...skipping 10 matching lines...) Expand all
44 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); 51 Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
45 DCHECK(browser && browser->window() && browser->fullscreen_controller()); 52 DCHECK(browser && browser->window() && browser->fullscreen_controller());
46 53
47 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); 54 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
48 bool is_fullscreen = browser_view->IsFullscreen(); 55 bool is_fullscreen = browser_view->IsFullscreen();
49 bool anchor_to_view = !is_fullscreen || 56 bool anchor_to_view = !is_fullscreen ||
50 browser_view->immersive_mode_controller()->IsRevealed(); 57 browser_view->immersive_mode_controller()->IsRevealed();
51 views::View* anchor_view = anchor_to_view ? 58 views::View* anchor_view = anchor_to_view ?
52 browser_view->GetLocationBarView()->zoom_view() : NULL; 59 browser_view->GetLocationBarView()->zoom_view() : NULL;
53 60
54 // If the bubble is already showing in this window and its |auto_close_| value 61 // Find the extension that initiated the zoom change, if any.
55 // is equal to |auto_close|, the bubble can be reused and only the label text 62 ZoomController* zoom_controller =
56 // needs to be updated. 63 ZoomController::FromWebContents(web_contents);
64 const extensions::Extension* extension = zoom_controller->last_extension();
65
66 // If the bubble is already showing in this window, its |auto_close_| value
67 // is equal to |auto_close|, and the zoom change was not initiated by an
68 // extension, then the bubble can be reused and only the label text needs to
69 // be updated.
57 if (zoom_bubble_ && 70 if (zoom_bubble_ &&
58 zoom_bubble_->GetAnchorView() == anchor_view && 71 zoom_bubble_->GetAnchorView() == anchor_view &&
59 zoom_bubble_->auto_close_ == auto_close) { 72 zoom_bubble_->auto_close_ == auto_close &&
60 zoom_bubble_->Refresh(); 73 !extension) {
61 } else { 74 zoom_bubble_->Refresh();
62 // If the bubble is already showing but its |auto_close_| value is not equal 75 return;
63 // to |auto_close|, the bubble's focus properties must change, so the 76 }
64 // current bubble must be closed and a new one created.
65 CloseBubble();
66 77
67 zoom_bubble_ = new ZoomBubbleView(anchor_view, 78 // If the bubble is already showing but its |auto_close_| value is not equal
68 web_contents, 79 // to |auto_close|, the bubble's focus properties must change, so the
69 auto_close, 80 // current bubble must be closed and a new one created.
70 browser_view->immersive_mode_controller(), 81 CloseBubble();
71 browser->fullscreen_controller());
72 82
73 // If we do not have an anchor view, parent the bubble to the content area. 83 zoom_bubble_ = new ZoomBubbleView(anchor_view,
74 if (!anchor_to_view) { 84 web_contents,
75 zoom_bubble_->set_parent_window(web_contents->GetTopLevelNativeWindow()); 85 auto_close,
76 } 86 browser_view->immersive_mode_controller(),
87 browser->fullscreen_controller());
77 88
78 views::BubbleDelegateView::CreateBubble(zoom_bubble_); 89 // If the zoom change was initiated by an extension, capture the relevent
90 // information from it.
91 if (extension)
92 zoom_bubble_->SetExtensionInfo(extension);
79 93
80 // Adjust for fullscreen after creation as it relies on the content size. 94 // If we do not have an anchor view, parent the bubble to the content area.
81 if (is_fullscreen) 95 if (!anchor_to_view) {
82 zoom_bubble_->AdjustForFullscreen(browser_view->GetBoundsInScreen()); 96 zoom_bubble_->set_parent_window(web_contents->GetTopLevelNativeWindow());
97 }
83 98
84 if (zoom_bubble_->use_focusless()) 99 views::BubbleDelegateView::CreateBubble(zoom_bubble_);
85 zoom_bubble_->GetWidget()->ShowInactive(); 100
86 else 101 // Adjust for fullscreen after creation as it relies on the content size.
87 zoom_bubble_->GetWidget()->Show(); 102 if (is_fullscreen)
88 } 103 zoom_bubble_->AdjustForFullscreen(browser_view->GetBoundsInScreen());
104
105 if (zoom_bubble_->use_focusless())
106 zoom_bubble_->GetWidget()->ShowInactive();
107 else
108 zoom_bubble_->GetWidget()->Show();
89 } 109 }
90 110
91 // static 111 // static
92 void ZoomBubbleView::CloseBubble() { 112 void ZoomBubbleView::CloseBubble() {
93 if (zoom_bubble_) 113 if (zoom_bubble_)
94 zoom_bubble_->Close(); 114 zoom_bubble_->Close();
95 } 115 }
96 116
97 // static 117 // static
98 bool ZoomBubbleView::IsShowing() { 118 bool ZoomBubbleView::IsShowing() {
99 // The bubble may be in the process of closing. 119 // The bubble may be in the process of closing.
100 return zoom_bubble_ != NULL && zoom_bubble_->GetWidget()->IsVisible(); 120 return zoom_bubble_ != NULL && zoom_bubble_->GetWidget()->IsVisible();
101 } 121 }
102 122
103 // static 123 // static
104 const ZoomBubbleView* ZoomBubbleView::GetZoomBubbleForTest() { 124 const ZoomBubbleView* ZoomBubbleView::GetZoomBubbleForTest() {
105 return zoom_bubble_; 125 return zoom_bubble_;
106 } 126 }
107 127
108 ZoomBubbleView::ZoomBubbleView( 128 ZoomBubbleView::ZoomBubbleView(
109 views::View* anchor_view, 129 views::View* anchor_view,
110 content::WebContents* web_contents, 130 content::WebContents* web_contents,
111 bool auto_close, 131 bool auto_close,
112 ImmersiveModeController* immersive_mode_controller, 132 ImmersiveModeController* immersive_mode_controller,
113 FullscreenController* fullscreen_controller) 133 FullscreenController* fullscreen_controller)
114 : BubbleDelegateView(anchor_view, anchor_view ? 134 : BubbleDelegateView(anchor_view, anchor_view ?
115 views::BubbleBorder::TOP_RIGHT : views::BubbleBorder::NONE), 135 views::BubbleBorder::TOP_RIGHT : views::BubbleBorder::NONE),
136 image_button_(NULL),
116 label_(NULL), 137 label_(NULL),
117 web_contents_(web_contents), 138 web_contents_(web_contents),
118 auto_close_(auto_close), 139 auto_close_(auto_close),
119 immersive_mode_controller_(immersive_mode_controller) { 140 immersive_mode_controller_(immersive_mode_controller) {
120 // Compensate for built-in vertical padding in the anchor view's image. 141 // Compensate for built-in vertical padding in the anchor view's image.
121 set_anchor_view_insets(gfx::Insets(5, 0, 5, 0)); 142 set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
122 set_use_focusless(auto_close); 143 set_use_focusless(auto_close);
123 set_notify_enter_exit_on_child(true); 144 set_notify_enter_exit_on_child(true);
124 145
125 // Add observers to close the bubble if the fullscreen state or immersive 146 // Add observers to close the bubble if the fullscreen state or immersive
(...skipping 17 matching lines...) Expand all
143 const size_t bubble_half_width = width() / 2; 164 const size_t bubble_half_width = width() / 2;
144 const int x_pos = base::i18n::IsRTL() ? 165 const int x_pos = base::i18n::IsRTL() ?
145 screen_bounds.x() + bubble_half_width + kFullscreenPaddingEnd : 166 screen_bounds.x() + bubble_half_width + kFullscreenPaddingEnd :
146 screen_bounds.right() - bubble_half_width - kFullscreenPaddingEnd; 167 screen_bounds.right() - bubble_half_width - kFullscreenPaddingEnd;
147 SetAnchorRect(gfx::Rect(x_pos, screen_bounds.y(), 0, 0)); 168 SetAnchorRect(gfx::Rect(x_pos, screen_bounds.y(), 0, 0));
148 } 169 }
149 170
150 void ZoomBubbleView::Refresh() { 171 void ZoomBubbleView::Refresh() {
151 ZoomController* zoom_controller = 172 ZoomController* zoom_controller =
152 ZoomController::FromWebContents(web_contents_); 173 ZoomController::FromWebContents(web_contents_);
153 int zoom_percent = zoom_controller->zoom_percent(); 174 int zoom_percent = zoom_controller->GetZoomPercent();
154 label_->SetText( 175 label_->SetText(
155 l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent)); 176 l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent));
156 StartTimerIfNecessary(); 177 StartTimerIfNecessary();
157 } 178 }
158 179
159 void ZoomBubbleView::Close() { 180 void ZoomBubbleView::Close() {
160 GetWidget()->Close(); 181 GetWidget()->Close();
161 } 182 }
162 183
184 void ZoomBubbleView::SetExtensionInfo(const extensions::Extension* extension) {
185 DCHECK(extension);
186 extension_info_.id = extension->id();
187 extension_info_.name = extension->name();
188
189 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
190 const gfx::ImageSkia& default_extension_icon_image =
191 *rb.GetImageSkiaNamed(IDR_EXTENSIONS_FAVICON);
192 int icon_size = gfx::kFaviconSize;
193
194 // We give first preference to an icon from the extension's icon set that
195 // matches the size of the default. But not all extensions will declare an
196 // icon set, or may not have an icon of the default size (we don't want the
197 // bubble to display, for example, a very large icon). In that case, if there
198 // is a browser-action icon (size-19) this is an acceptable alternative.
199 const ExtensionIconSet& icons = extensions::IconsInfo::GetIcons(extension);
200 const ExtensionIconSet& action_icon =
201 extensions::ActionInfo::GetBrowserActionInfo(extension)
202 ->default_icon;
203 bool has_default_sized_icon =
204 !icons.Get(gfx::kFaviconSize, ExtensionIconSet::MATCH_EXACTLY).empty();
205 if (!has_default_sized_icon && !action_icon.empty())
206 icon_size = action_icon.map().begin()->first;
207 const ExtensionIconSet& icon_set_to_use =
208 has_default_sized_icon ? icons : action_icon;
209 extension_info_.icon_image.reset(
210 new extensions::IconImage(web_contents_->GetBrowserContext(),
211 extension,
212 icon_set_to_use,
213 icon_size,
214 default_extension_icon_image,
215 this));
216 }
217
163 void ZoomBubbleView::StartTimerIfNecessary() { 218 void ZoomBubbleView::StartTimerIfNecessary() {
164 if (auto_close_) { 219 if (auto_close_) {
165 if (timer_.IsRunning()) { 220 if (timer_.IsRunning()) {
166 timer_.Reset(); 221 timer_.Reset();
167 } else { 222 } else {
168 timer_.Start( 223 timer_.Start(
169 FROM_HERE, 224 FROM_HERE,
170 base::TimeDelta::FromMilliseconds(kBubbleCloseDelay), 225 base::TimeDelta::FromMilliseconds(kBubbleCloseDelay),
171 this, 226 this,
172 &ZoomBubbleView::Close); 227 &ZoomBubbleView::Close);
173 } 228 }
174 } 229 }
175 } 230 }
176 231
177 void ZoomBubbleView::StopTimer() { 232 void ZoomBubbleView::StopTimer() {
178 timer_.Stop(); 233 timer_.Stop();
179 } 234 }
180 235
236 void ZoomBubbleView::OnExtensionIconImageChanged(extensions::IconImage* image) {
237 DCHECK_EQ(image, extension_info_.icon_image.get()) <<
238 "Unknown ImageIcon update.";
239 image_button_->SetImage(views::Button::STATE_NORMAL,
240 &extension_info_.icon_image->image_skia());
241 image_button_->SchedulePaint();
242 }
243
181 void ZoomBubbleView::OnMouseEntered(const ui::MouseEvent& event) { 244 void ZoomBubbleView::OnMouseEntered(const ui::MouseEvent& event) {
182 set_use_focusless(false); 245 set_use_focusless(false);
183 StopTimer(); 246 StopTimer();
184 } 247 }
185 248
186 void ZoomBubbleView::OnMouseExited(const ui::MouseEvent& event) { 249 void ZoomBubbleView::OnMouseExited(const ui::MouseEvent& event) {
187 set_use_focusless(auto_close_); 250 set_use_focusless(auto_close_);
188 StartTimerIfNecessary(); 251 StartTimerIfNecessary();
189 } 252 }
190 253
191 void ZoomBubbleView::OnGestureEvent(ui::GestureEvent* event) { 254 void ZoomBubbleView::OnGestureEvent(ui::GestureEvent* event) {
192 if (!zoom_bubble_ || !zoom_bubble_->auto_close_ || 255 if (!zoom_bubble_ || !zoom_bubble_->auto_close_ ||
193 event->type() != ui::ET_GESTURE_TAP) { 256 event->type() != ui::ET_GESTURE_TAP) {
194 return; 257 return;
195 } 258 }
196 259
197 // If an auto-closing bubble was tapped, show a non-auto-closing bubble in 260 // If an auto-closing bubble was tapped, show a non-auto-closing bubble in
198 // its place. 261 // its place.
199 ShowBubble(zoom_bubble_->web_contents_, false); 262 ShowBubble(zoom_bubble_->web_contents_, false);
200 event->SetHandled(); 263 event->SetHandled();
201 } 264 }
202 265
203 void ZoomBubbleView::ButtonPressed(views::Button* sender, 266 void ZoomBubbleView::ButtonPressed(views::Button* sender,
204 const ui::Event& event) { 267 const ui::Event& event) {
205 chrome_page_zoom::Zoom(web_contents_, content::PAGE_ZOOM_RESET); 268 if (sender == image_button_) {
269 DCHECK(extension_info_.icon_image.get()) << "Invalid button press.";
270 Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
271 std::string url = base::StringPrintf("chrome://extensions?id=");
272 url += extension_info_.id;
273 chrome::AddSelectedTabWithURL(browser,
274 GURL(url),
275 content::PAGE_TRANSITION_FROM_API);
276 } else {
277 chrome_page_zoom::Zoom(web_contents_, content::PAGE_ZOOM_RESET);
278 }
206 } 279 }
207 280
208 void ZoomBubbleView::Init() { 281 void ZoomBubbleView::Init() {
209 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 282 // Set up the layout of the zoom bubble. A grid layout is used because
210 0, 0, views::kRelatedControlVerticalSpacing)); 283 // sometimes an extension icon is shown next to the zoom label.
284 views::GridLayout* grid_layout = new views::GridLayout(this);
285 SetLayoutManager(grid_layout);
286 views::ColumnSet* columns = grid_layout->AddColumnSet(0);
287 // First row.
288 if (extension_info_.icon_image.get()) {
289 columns->AddColumn(views::GridLayout::CENTER,views::GridLayout::CENTER, 2,
290 views::GridLayout::USE_PREF, 0, 0);
291 }
292 columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
293 views::GridLayout::USE_PREF, 0, 0);
294 grid_layout->StartRow(0, 0);
211 295
296 // If this zoom change was initiated by an extension, that extension will be
297 // attributed by showing its icon in the zoom bubble.
298 if (extension_info_.icon_image.get()) {
299 image_button_ = new views::ImageButton(this);
300 image_button_->SetTooltipText(l10n_util::GetStringFUTF16(
301 IDS_TOOLTIP_ZOOM_EXTENSION_ICON,
302 base::UTF8ToUTF16(extension_info_.name)));
303 image_button_->SetImage(views::Button::STATE_NORMAL,
304 &extension_info_.icon_image->image_skia());
305 grid_layout->AddView(image_button_);
306 }
307
308 // Add zoom label with the new zoom percent.
212 ZoomController* zoom_controller = 309 ZoomController* zoom_controller =
213 ZoomController::FromWebContents(web_contents_); 310 ZoomController::FromWebContents(web_contents_);
214 int zoom_percent = zoom_controller->zoom_percent(); 311 int zoom_percent = zoom_controller->GetZoomPercent();
215 label_ = new views::Label( 312 label_ = new views::Label(
216 l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent)); 313 l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent));
217 label_->SetFontList( 314 label_->SetFontList(
218 ui::ResourceBundle::GetSharedInstance().GetFontList( 315 ui::ResourceBundle::GetSharedInstance().GetFontList(
219 ui::ResourceBundle::MediumFont)); 316 ui::ResourceBundle::MediumFont));
220 AddChildView(label_); 317 grid_layout->AddView(label_);
221 318
319 // Second row.
320 grid_layout->AddPaddingRow(0, 8);
321 columns = grid_layout->AddColumnSet(1);
322 columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
323 views::GridLayout::USE_PREF, 0, 0);
324 grid_layout->StartRow(0, 1);
325
326 // Add "Reset to Default" button.
222 views::LabelButton* set_default_button = new views::LabelButton( 327 views::LabelButton* set_default_button = new views::LabelButton(
223 this, l10n_util::GetStringUTF16(IDS_ZOOM_SET_DEFAULT)); 328 this, l10n_util::GetStringUTF16(IDS_ZOOM_SET_DEFAULT));
224 set_default_button->SetStyle(views::Button::STYLE_BUTTON); 329 set_default_button->SetStyle(views::Button::STYLE_BUTTON);
225 set_default_button->SetHorizontalAlignment(gfx::ALIGN_CENTER); 330 set_default_button->SetHorizontalAlignment(gfx::ALIGN_CENTER);
226 AddChildView(set_default_button); 331 grid_layout->AddView(set_default_button);
227 332
228 StartTimerIfNecessary(); 333 StartTimerIfNecessary();
229 } 334 }
230 335
231 void ZoomBubbleView::Observe(int type, 336 void ZoomBubbleView::Observe(int type,
232 const content::NotificationSource& source, 337 const content::NotificationSource& source,
233 const content::NotificationDetails& details) { 338 const content::NotificationDetails& details) {
234 DCHECK_EQ(type, chrome::NOTIFICATION_FULLSCREEN_CHANGED); 339 DCHECK_EQ(type, chrome::NOTIFICATION_FULLSCREEN_CHANGED);
235 CloseBubble(); 340 CloseBubble();
236 } 341 }
237 342
238 void ZoomBubbleView::OnImmersiveRevealStarted() { 343 void ZoomBubbleView::OnImmersiveRevealStarted() {
239 CloseBubble(); 344 CloseBubble();
240 } 345 }
241 346
242 void ZoomBubbleView::OnImmersiveModeControllerDestroyed() { 347 void ZoomBubbleView::OnImmersiveModeControllerDestroyed() {
243 immersive_mode_controller_ = NULL; 348 immersive_mode_controller_ = NULL;
244 } 349 }
245 350
246 void ZoomBubbleView::WindowClosing() { 351 void ZoomBubbleView::WindowClosing() {
247 // |zoom_bubble_| can be a new bubble by this point (as Close(); doesn't 352 // |zoom_bubble_| can be a new bubble by this point (as Close(); doesn't
248 // call this right away). Only set to NULL when it's this bubble. 353 // call this right away). Only set to NULL when it's this bubble.
249 if (zoom_bubble_ == this) 354 if (zoom_bubble_ == this)
250 zoom_bubble_ = NULL; 355 zoom_bubble_ = NULL;
251 } 356 }
357
358 ZoomBubbleView::ZoomBubbleExtensionInfo::ZoomBubbleExtensionInfo() {}
359
360 ZoomBubbleView::ZoomBubbleExtensionInfo::~ZoomBubbleExtensionInfo() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698