OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/location_bar/location_bar_view.h" | 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 #include "ui/base/layout.h" | 68 #include "ui/base/layout.h" |
69 #include "ui/base/resource/resource_bundle.h" | 69 #include "ui/base/resource/resource_bundle.h" |
70 #include "ui/base/theme_provider.h" | 70 #include "ui/base/theme_provider.h" |
71 #include "ui/gfx/canvas.h" | 71 #include "ui/gfx/canvas.h" |
72 #include "ui/gfx/color_utils.h" | 72 #include "ui/gfx/color_utils.h" |
73 #include "ui/gfx/image/image.h" | 73 #include "ui/gfx/image/image.h" |
74 #include "ui/gfx/skia_util.h" | 74 #include "ui/gfx/skia_util.h" |
75 #include "ui/views/border.h" | 75 #include "ui/views/border.h" |
76 #include "ui/views/button_drag_utils.h" | 76 #include "ui/views/button_drag_utils.h" |
77 #include "ui/views/controls/label.h" | 77 #include "ui/views/controls/label.h" |
| 78 #include "ui/views/widget/widget.h" |
78 | 79 |
79 #if defined(OS_WIN) | 80 #if defined(OS_WIN) |
80 #include "base/win/metro.h" | 81 #include "base/win/metro.h" |
81 #endif | 82 #endif |
82 | 83 |
83 #if defined(OS_WIN) && !defined(USE_AURA) | 84 #if defined(OS_WIN) && !defined(USE_AURA) |
84 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" | 85 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" |
85 #endif | 86 #endif |
86 | 87 |
87 #if !defined(OS_CHROMEOS) | 88 #if !defined(OS_CHROMEOS) |
(...skipping 1437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1525 } | 1526 } |
1526 | 1527 |
1527 void LocationBarView::CleanupFadeAnimation() { | 1528 void LocationBarView::CleanupFadeAnimation() { |
1528 // Since we're no longer animating we don't need our layer. | 1529 // Since we're no longer animating we don't need our layer. |
1529 SetPaintToLayer(false); | 1530 SetPaintToLayer(false); |
1530 // Bubble labels don't need a transparent background anymore. | 1531 // Bubble labels don't need a transparent background anymore. |
1531 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); | 1532 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); |
1532 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); | 1533 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); |
1533 } | 1534 } |
1534 #endif // USE_AURA | 1535 #endif // USE_AURA |
OLD | NEW |