| OLD | NEW |
| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/i18n/number_formatting.h" | 9 #include "base/i18n/number_formatting.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 #include "ui/views/focus/view_storage.h" | 65 #include "ui/views/focus/view_storage.h" |
| 66 #include "ui/views/widget/tooltip_manager.h" | 66 #include "ui/views/widget/tooltip_manager.h" |
| 67 #include "ui/views/widget/widget.h" | 67 #include "ui/views/widget/widget.h" |
| 68 #include "ui/views/window/non_client_view.h" | 68 #include "ui/views/window/non_client_view.h" |
| 69 | 69 |
| 70 #if defined(OS_WIN) | 70 #if defined(OS_WIN) |
| 71 #include "base/win/windows_version.h" | 71 #include "base/win/windows_version.h" |
| 72 #include "chrome/browser/enumerate_modules_model_win.h" | 72 #include "chrome/browser/enumerate_modules_model_win.h" |
| 73 #include "chrome/browser/ui/views/conflicting_module_view_win.h" | 73 #include "chrome/browser/ui/views/conflicting_module_view_win.h" |
| 74 #include "chrome/browser/ui/views/critical_notification_bubble_view.h" | 74 #include "chrome/browser/ui/views/critical_notification_bubble_view.h" |
| 75 #if !defined(USE_AURA) | |
| 76 #include "chrome/browser/ui/views/app_menu_button_win.h" | |
| 77 #endif | |
| 78 #endif | 75 #endif |
| 79 | 76 |
| 80 #if defined(USE_AURA) | 77 #if defined(USE_AURA) |
| 81 #include "ui/aura/window.h" | 78 #include "ui/aura/window.h" |
| 82 #include "ui/compositor/layer.h" | 79 #include "ui/compositor/layer.h" |
| 83 #include "ui/native_theme/native_theme_aura.h" | 80 #include "ui/native_theme/native_theme_aura.h" |
| 84 #endif | 81 #endif |
| 85 | 82 |
| 86 using base::UserMetricsAction; | 83 using base::UserMetricsAction; |
| 87 using content::WebContents; | 84 using content::WebContents; |
| (...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 829 | 826 |
| 830 void ToolbarView::OnShowHomeButtonChanged() { | 827 void ToolbarView::OnShowHomeButtonChanged() { |
| 831 Layout(); | 828 Layout(); |
| 832 SchedulePaint(); | 829 SchedulePaint(); |
| 833 } | 830 } |
| 834 | 831 |
| 835 int ToolbarView::content_shadow_height() const { | 832 int ToolbarView::content_shadow_height() const { |
| 836 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? | 833 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? |
| 837 kContentShadowHeightAsh : kContentShadowHeight; | 834 kContentShadowHeightAsh : kContentShadowHeight; |
| 838 } | 835 } |
| OLD | NEW |