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

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

Issue 2276823003: Change many chrome/browser includes to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 28 matching lines...) Expand all
39 #include "chrome/browser/ui/views/toolbar/back_button.h" 39 #include "chrome/browser/ui/views/toolbar/back_button.h"
40 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 40 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
41 #include "chrome/browser/ui/views/toolbar/home_button.h" 41 #include "chrome/browser/ui/views/toolbar/home_button.h"
42 #include "chrome/browser/ui/views/toolbar/reload_button.h" 42 #include "chrome/browser/ui/views/toolbar/reload_button.h"
43 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" 43 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
44 #include "chrome/browser/ui/views/translate/translate_icon_view.h" 44 #include "chrome/browser/ui/views/translate/translate_icon_view.h"
45 #include "chrome/common/chrome_switches.h" 45 #include "chrome/common/chrome_switches.h"
46 #include "chrome/common/pref_names.h" 46 #include "chrome/common/pref_names.h"
47 #include "chrome/grit/chromium_strings.h" 47 #include "chrome/grit/chromium_strings.h"
48 #include "chrome/grit/generated_resources.h" 48 #include "chrome/grit/generated_resources.h"
49 #include "chrome/grit/theme_resources.h"
49 #include "components/omnibox/browser/omnibox_view.h" 50 #include "components/omnibox/browser/omnibox_view.h"
50 #include "components/prefs/pref_service.h" 51 #include "components/prefs/pref_service.h"
52 #include "components/strings/grit/components_strings.h"
51 #include "content/public/browser/browser_accessibility_state.h" 53 #include "content/public/browser/browser_accessibility_state.h"
52 #include "content/public/browser/notification_service.h" 54 #include "content/public/browser/notification_service.h"
53 #include "content/public/browser/render_view_host.h" 55 #include "content/public/browser/render_view_host.h"
54 #include "content/public/browser/user_metrics.h" 56 #include "content/public/browser/user_metrics.h"
55 #include "content/public/browser/web_contents.h" 57 #include "content/public/browser/web_contents.h"
56 #include "grit/components_strings.h"
57 #include "grit/theme_resources.h"
58 #include "ui/accessibility/ax_view_state.h" 58 #include "ui/accessibility/ax_view_state.h"
59 #include "ui/base/l10n/l10n_util.h" 59 #include "ui/base/l10n/l10n_util.h"
60 #include "ui/base/material_design/material_design_controller.h" 60 #include "ui/base/material_design/material_design_controller.h"
61 #include "ui/base/theme_provider.h" 61 #include "ui/base/theme_provider.h"
62 #include "ui/base/window_open_disposition.h" 62 #include "ui/base/window_open_disposition.h"
63 #include "ui/compositor/layer.h" 63 #include "ui/compositor/layer.h"
64 #include "ui/gfx/canvas.h" 64 #include "ui/gfx/canvas.h"
65 #include "ui/gfx/image/canvas_image_source.h" 65 #include "ui/gfx/image/canvas_image_source.h"
66 #include "ui/gfx/paint_vector_icon.h" 66 #include "ui/gfx/paint_vector_icon.h"
67 #include "ui/gfx/vector_icons_public.h" 67 #include "ui/gfx/vector_icons_public.h"
(...skipping 729 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