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

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

Issue 2272173002: Fix most chrome/browser/ui "gn check" problems. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 4 years, 3 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "chrome/browser/ui/views/conflicting_module_view_win.h" 78 #include "chrome/browser/ui/views/conflicting_module_view_win.h"
79 #include "chrome/browser/ui/views/critical_notification_bubble_view.h" 79 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
80 #endif 80 #endif
81 81
82 #if !defined(OS_CHROMEOS) 82 #if !defined(OS_CHROMEOS)
83 #include "chrome/browser/signin/signin_global_error_factory.h" 83 #include "chrome/browser/signin/signin_global_error_factory.h"
84 #include "chrome/browser/sync/sync_global_error_factory.h" 84 #include "chrome/browser/sync/sync_global_error_factory.h"
85 #endif 85 #endif
86 86
87 #if defined(USE_ASH) 87 #if defined(USE_ASH)
88 #include "ash/shell.h" 88 #include "ash/shell.h" // nogncheck
89 #endif 89 #endif
90 90
91 using base::UserMetricsAction; 91 using base::UserMetricsAction;
92 using content::WebContents; 92 using content::WebContents;
93 93
94 namespace { 94 namespace {
95 95
96 #if !defined(OS_CHROMEOS) 96 #if !defined(OS_CHROMEOS)
97 bool HasAshShell() { 97 bool HasAshShell() {
98 #if defined(USE_ASH) 98 #if defined(USE_ASH)
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 SchedulePaint(); 797 SchedulePaint();
798 } 798 }
799 799
800 int ToolbarView::content_shadow_height() const { 800 int ToolbarView::content_shadow_height() const {
801 #if defined(USE_ASH) 801 #if defined(USE_ASH)
802 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH); 802 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH);
803 #else 803 #else
804 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT); 804 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT);
805 #endif 805 #endif
806 } 806 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698