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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 10917075: events: Move some files into ui/base/events/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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 (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/command_line.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "chrome/common/chrome_notification_types.h" 55 #include "chrome/common/chrome_notification_types.h"
56 #include "chrome/common/extensions/extension_switch_utils.h" 56 #include "chrome/common/extensions/extension_switch_utils.h"
57 #include "chrome/common/pref_names.h" 57 #include "chrome/common/pref_names.h"
58 #include "content/public/browser/notification_service.h" 58 #include "content/public/browser/notification_service.h"
59 #include "content/public/browser/render_widget_host_view.h" 59 #include "content/public/browser/render_widget_host_view.h"
60 #include "content/public/browser/web_contents.h" 60 #include "content/public/browser/web_contents.h"
61 #include "grit/generated_resources.h" 61 #include "grit/generated_resources.h"
62 #include "grit/theme_resources.h" 62 #include "grit/theme_resources.h"
63 #include "ui/base/accessibility/accessible_view_state.h" 63 #include "ui/base/accessibility/accessible_view_state.h"
64 #include "ui/base/dragdrop/drag_drop_types.h" 64 #include "ui/base/dragdrop/drag_drop_types.h"
65 #include "ui/base/event.h" 65 #include "ui/base/events/event.h"
66 #include "ui/base/l10n/l10n_util.h" 66 #include "ui/base/l10n/l10n_util.h"
67 #include "ui/base/layout.h" 67 #include "ui/base/layout.h"
68 #include "ui/base/resource/resource_bundle.h" 68 #include "ui/base/resource/resource_bundle.h"
69 #include "ui/base/theme_provider.h" 69 #include "ui/base/theme_provider.h"
70 #include "ui/gfx/canvas.h" 70 #include "ui/gfx/canvas.h"
71 #include "ui/gfx/color_utils.h" 71 #include "ui/gfx/color_utils.h"
72 #include "ui/gfx/image/image.h" 72 #include "ui/gfx/image/image.h"
73 #include "ui/gfx/skia_util.h" 73 #include "ui/gfx/skia_util.h"
74 #include "ui/views/border.h" 74 #include "ui/views/border.h"
75 #include "ui/views/button_drag_utils.h" 75 #include "ui/views/button_drag_utils.h"
(...skipping 1424 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 } 1500 }
1501 1501
1502 void LocationBarView::CleanupFadeAnimation() { 1502 void LocationBarView::CleanupFadeAnimation() {
1503 // Since we're no longer animating we don't need our layer. 1503 // Since we're no longer animating we don't need our layer.
1504 SetPaintToLayer(false); 1504 SetPaintToLayer(false);
1505 // Bubble labels don't need a transparent background anymore. 1505 // Bubble labels don't need a transparent background anymore.
1506 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1506 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1507 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1507 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1508 } 1508 }
1509 #endif // USE_AURA 1509 #endif // USE_AURA
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698