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/command_line.h" |
10 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
11 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
12 #include "chrome/app/chrome_command_ids.h" | 13 #include "chrome/app/chrome_command_ids.h" |
13 #include "chrome/browser/alternate_nav_url_fetcher.h" | 14 #include "chrome/browser/alternate_nav_url_fetcher.h" |
14 #include "chrome/browser/chrome_to_mobile_service.h" | 15 #include "chrome/browser/chrome_to_mobile_service.h" |
15 #include "chrome/browser/chrome_to_mobile_service_factory.h" | 16 #include "chrome/browser/chrome_to_mobile_service_factory.h" |
16 #include "chrome/browser/command_updater.h" | 17 #include "chrome/browser/command_updater.h" |
17 #include "chrome/browser/defaults.h" | 18 #include "chrome/browser/defaults.h" |
18 #include "chrome/browser/extensions/extension_service.h" | 19 #include "chrome/browser/extensions/extension_service.h" |
19 #include "chrome/browser/extensions/extension_system.h" | 20 #include "chrome/browser/extensions/extension_system.h" |
(...skipping 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1505 } | 1506 } |
1506 | 1507 |
1507 void LocationBarView::CleanupFadeAnimation() { | 1508 void LocationBarView::CleanupFadeAnimation() { |
1508 // Since we're no longer animating we don't need our layer. | 1509 // Since we're no longer animating we don't need our layer. |
1509 SetPaintToLayer(false); | 1510 SetPaintToLayer(false); |
1510 // Bubble labels don't need a transparent background anymore. | 1511 // Bubble labels don't need a transparent background anymore. |
1511 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); | 1512 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); |
1512 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); | 1513 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); |
1513 } | 1514 } |
1514 #endif // USE_AURA | 1515 #endif // USE_AURA |
OLD | NEW |