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

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

Issue 138943006: Remove a bunch of dead files after the win aura switch. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
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 "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
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
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/native_view_photobooth_win.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698