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

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

Issue 2374803002: Remove a bunch of pre-MD toolbar code and assets. (Closed)
Patch Set: fix mac? Created 4 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 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 void ToolbarView::RemovePaneFocus() { 616 void ToolbarView::RemovePaneFocus() {
617 AccessiblePaneView::RemovePaneFocus(); 617 AccessiblePaneView::RemovePaneFocus();
618 location_bar_->SetShowFocusRect(false); 618 location_bar_->SetShowFocusRect(false);
619 } 619 }
620 620
621 //////////////////////////////////////////////////////////////////////////////// 621 ////////////////////////////////////////////////////////////////////////////////
622 // ToolbarView, private: 622 // ToolbarView, private:
623 623
624 // AppMenuIconController::Delegate: 624 // AppMenuIconController::Delegate:
625 void ToolbarView::UpdateSeverity(AppMenuIconController::IconType type, 625 void ToolbarView::UpdateSeverity(AppMenuIconController::IconType type,
626 AppMenuIconPainter::Severity severity, 626 AppMenuIconController::Severity severity,
627 bool animate) { 627 bool animate) {
628 // There's no app menu in tabless windows. 628 // There's no app menu in tabless windows.
629 if (!app_menu_button_) 629 if (!app_menu_button_)
630 return; 630 return;
631 631
632 // Showing the bubble requires |app_menu_button_| to be in a widget. See 632 // Showing the bubble requires |app_menu_button_| to be in a widget. See
633 // comment in ConflictingModuleView for details. 633 // comment in ConflictingModuleView for details.
634 DCHECK(app_menu_button_->GetWidget()); 634 DCHECK(app_menu_button_->GetWidget());
635 635
636 base::string16 accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP); 636 base::string16 accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP);
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 if (OutdatedUpgradeBubbleView::IsAvailable()) { 742 if (OutdatedUpgradeBubbleView::IsAvailable()) {
743 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_, 743 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_,
744 auto_update_enabled); 744 auto_update_enabled);
745 } 745 }
746 } 746 }
747 747
748 void ToolbarView::OnShowHomeButtonChanged() { 748 void ToolbarView::OnShowHomeButtonChanged() {
749 Layout(); 749 Layout();
750 SchedulePaint(); 750 SchedulePaint();
751 } 751 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698