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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_view.cc

Issue 1396923003: Autofill: Replace "save credit card" infobar with a bubble (Views only). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/toolbar/toolbar_view.h" 5 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/ui/global_error/global_error_service.h" 26 #include "chrome/browser/ui/global_error/global_error_service.h"
27 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 27 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
28 #include "chrome/browser/ui/tabs/tab_strip_model.h" 28 #include "chrome/browser/ui/tabs/tab_strip_model.h"
29 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 29 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
30 #include "chrome/browser/ui/view_ids.h" 30 #include "chrome/browser/ui/view_ids.h"
31 #include "chrome/browser/ui/views/extensions/extension_popup.h" 31 #include "chrome/browser/ui/views/extensions/extension_popup.h"
32 #include "chrome/browser/ui/views/frame/browser_view.h" 32 #include "chrome/browser/ui/views/frame/browser_view.h"
33 #include "chrome/browser/ui/views/layout_constants.h" 33 #include "chrome/browser/ui/views/layout_constants.h"
34 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h" 34 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
35 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" 35 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
36 #include "chrome/browser/ui/views/location_bar/save_credit_card_icon_view.h"
36 #include "chrome/browser/ui/views/location_bar/star_view.h" 37 #include "chrome/browser/ui/views/location_bar/star_view.h"
37 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h" 38 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h"
38 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h" 39 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"
39 #include "chrome/browser/ui/views/toolbar/back_button.h" 40 #include "chrome/browser/ui/views/toolbar/back_button.h"
40 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 41 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
41 #include "chrome/browser/ui/views/toolbar/home_button.h" 42 #include "chrome/browser/ui/views/toolbar/home_button.h"
42 #include "chrome/browser/ui/views/toolbar/reload_button.h" 43 #include "chrome/browser/ui/views/toolbar/reload_button.h"
43 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" 44 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
44 #include "chrome/browser/ui/views/toolbar/wrench_menu.h" 45 #include "chrome/browser/ui/views/toolbar/wrench_menu.h"
45 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" 46 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 307
307 void ToolbarView::RemoveMenuListener(views::MenuListener* listener) { 308 void ToolbarView::RemoveMenuListener(views::MenuListener* listener) {
308 menu_listeners_.RemoveObserver(listener); 309 menu_listeners_.RemoveObserver(listener);
309 } 310 }
310 311
311 views::View* ToolbarView::GetBookmarkBubbleAnchor() { 312 views::View* ToolbarView::GetBookmarkBubbleAnchor() {
312 views::View* star_view = location_bar()->star_view(); 313 views::View* star_view = location_bar()->star_view();
313 return (star_view && star_view->visible()) ? star_view : app_menu_; 314 return (star_view && star_view->visible()) ? star_view : app_menu_;
314 } 315 }
315 316
317 views::View* ToolbarView::GetSaveCreditCardBubbleAnchor() {
318 views::View* save_credit_card_icon_view =
319 location_bar()->save_credit_card_icon_view();
320 return (save_credit_card_icon_view && save_credit_card_icon_view->visible())
321 ? save_credit_card_icon_view
322 : app_menu_;
323 }
324
316 views::View* ToolbarView::GetTranslateBubbleAnchor() { 325 views::View* ToolbarView::GetTranslateBubbleAnchor() {
317 views::View* translate_icon_view = location_bar()->translate_icon_view(); 326 views::View* translate_icon_view = location_bar()->translate_icon_view();
318 return (translate_icon_view && translate_icon_view->visible()) ? 327 return (translate_icon_view && translate_icon_view->visible()) ?
319 translate_icon_view : app_menu_; 328 translate_icon_view : app_menu_;
320 } 329 }
321 330
322 void ToolbarView::ExecuteExtensionCommand( 331 void ToolbarView::ExecuteExtensionCommand(
323 const extensions::Extension* extension, 332 const extensions::Extension* extension,
324 const extensions::Command& command) { 333 const extensions::Command& command) {
325 browser_actions_->ExecuteExtensionCommand(extension, command); 334 browser_actions_->ExecuteExtensionCommand(extension, command);
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 void ToolbarView::OnShowHomeButtonChanged() { 845 void ToolbarView::OnShowHomeButtonChanged() {
837 Layout(); 846 Layout();
838 SchedulePaint(); 847 SchedulePaint();
839 } 848 }
840 849
841 int ToolbarView::content_shadow_height() const { 850 int ToolbarView::content_shadow_height() const {
842 return GetLayoutConstant( 851 return GetLayoutConstant(
843 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? 852 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
844 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); 853 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
845 } 854 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698