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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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"
11 #include "base/prefs/pref_service.h"
12 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
13 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
14 #include "build/build_config.h" 13 #include "build/build_config.h"
15 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/command_updater.h" 16 #include "chrome/browser/command_updater.h"
18 #include "chrome/browser/extensions/extension_commands_global_registry.h" 17 #include "chrome/browser/extensions/extension_commands_global_registry.h"
19 #include "chrome/browser/extensions/extension_util.h" 18 #include "chrome/browser/extensions/extension_util.h"
20 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/themes/theme_properties.h" 20 #include "chrome/browser/themes/theme_properties.h"
(...skipping 20 matching lines...) Expand all
42 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 41 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
43 #include "chrome/browser/ui/views/toolbar/home_button.h" 42 #include "chrome/browser/ui/views/toolbar/home_button.h"
44 #include "chrome/browser/ui/views/toolbar/reload_button.h" 43 #include "chrome/browser/ui/views/toolbar/reload_button.h"
45 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" 44 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
46 #include "chrome/browser/ui/views/translate/translate_icon_view.h" 45 #include "chrome/browser/ui/views/translate/translate_icon_view.h"
47 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
48 #include "chrome/common/pref_names.h" 47 #include "chrome/common/pref_names.h"
49 #include "chrome/grit/chromium_strings.h" 48 #include "chrome/grit/chromium_strings.h"
50 #include "chrome/grit/generated_resources.h" 49 #include "chrome/grit/generated_resources.h"
51 #include "components/omnibox/browser/omnibox_view.h" 50 #include "components/omnibox/browser/omnibox_view.h"
51 #include "components/prefs/pref_service.h"
52 #include "content/public/browser/browser_accessibility_state.h" 52 #include "content/public/browser/browser_accessibility_state.h"
53 #include "content/public/browser/notification_service.h" 53 #include "content/public/browser/notification_service.h"
54 #include "content/public/browser/render_view_host.h" 54 #include "content/public/browser/render_view_host.h"
55 #include "content/public/browser/user_metrics.h" 55 #include "content/public/browser/user_metrics.h"
56 #include "content/public/browser/web_contents.h" 56 #include "content/public/browser/web_contents.h"
57 #include "grit/components_strings.h" 57 #include "grit/components_strings.h"
58 #include "grit/theme_resources.h" 58 #include "grit/theme_resources.h"
59 #include "ui/accessibility/ax_view_state.h" 59 #include "ui/accessibility/ax_view_state.h"
60 #include "ui/base/l10n/l10n_util.h" 60 #include "ui/base/l10n/l10n_util.h"
61 #include "ui/base/material_design/material_design_controller.h" 61 #include "ui/base/material_design/material_design_controller.h"
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 void ToolbarView::OnShowHomeButtonChanged() { 822 void ToolbarView::OnShowHomeButtonChanged() {
823 Layout(); 823 Layout();
824 SchedulePaint(); 824 SchedulePaint();
825 } 825 }
826 826
827 int ToolbarView::content_shadow_height() const { 827 int ToolbarView::content_shadow_height() const {
828 return GetLayoutConstant( 828 return GetLayoutConstant(
829 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? 829 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
830 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); 830 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
831 } 831 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/browser/ui/views/translate/translate_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698