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

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

Issue 1971463002: Get rid of some lingering MD-specific raster assets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: msw review Created 4 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 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 // GetWidget()). 259 // GetWidget()).
260 badge_controller_.UpdateDelegate(); 260 badge_controller_.UpdateDelegate();
261 261
262 location_bar_->Init(); 262 location_bar_->Init();
263 263
264 show_home_button_.Init(prefs::kShowHomeButton, 264 show_home_button_.Init(prefs::kShowHomeButton,
265 browser_->profile()->GetPrefs(), 265 browser_->profile()->GetPrefs(),
266 base::Bind(&ToolbarView::OnShowHomeButtonChanged, 266 base::Bind(&ToolbarView::OnShowHomeButtonChanged,
267 base::Unretained(this))); 267 base::Unretained(this)));
268 268
269 browser_actions_->Init();
270
271 // Accessibility specific tooltip text. 269 // Accessibility specific tooltip text.
272 if (content::BrowserAccessibilityState::GetInstance()-> 270 if (content::BrowserAccessibilityState::GetInstance()->
273 IsAccessibleBrowser()) { 271 IsAccessibleBrowser()) {
274 back_->SetTooltipText( 272 back_->SetTooltipText(
275 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK)); 273 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK));
276 forward_->SetTooltipText( 274 forward_->SetTooltipText(
277 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_FORWARD)); 275 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_FORWARD));
278 } 276 }
279 } 277 }
280 278
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 SchedulePaint(); 795 SchedulePaint();
798 } 796 }
799 797
800 int ToolbarView::content_shadow_height() const { 798 int ToolbarView::content_shadow_height() const {
801 #if defined(USE_ASH) 799 #if defined(USE_ASH)
802 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH); 800 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH);
803 #else 801 #else
804 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT); 802 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT);
805 #endif 803 #endif
806 } 804 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698