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

Side by Side Diff: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/autocomplete/autocomplete_popup_contents_view. h" 5 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/i18n/bidi_line_iterator.h" 8 #include "base/i18n/bidi_line_iterator.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" 11 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
12 #include "chrome/browser/autocomplete/autocomplete_match.h" 12 #include "chrome/browser/autocomplete/autocomplete_match.h"
13 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 13 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
14 #include "chrome/browser/instant/instant_confirm_dialog.h" 14 #include "chrome/browser/instant/instant_confirm_dialog.h"
15 #include "chrome/browser/instant/promo_counter.h" 15 #include "chrome/browser/instant/promo_counter.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/views/bubble_border.h" 17 #include "chrome/browser/ui/views/bubble_border.h"
18 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 18 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
19 #include "gfx/canvas_skia.h"
20 #include "gfx/color_utils.h"
21 #include "gfx/insets.h"
22 #include "gfx/path.h"
23 #include "grit/chromium_strings.h" 19 #include "grit/chromium_strings.h"
24 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
25 #include "grit/theme_resources.h" 21 #include "grit/theme_resources.h"
26 #include "third_party/skia/include/core/SkShader.h" 22 #include "third_party/skia/include/core/SkShader.h"
27 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
29 #include "ui/base/text/text_elider.h" 25 #include "ui/base/text/text_elider.h"
30 #include "ui/base/theme_provider.h" 26 #include "ui/base/theme_provider.h"
27 #include "ui/gfx/canvas_skia.h"
28 #include "ui/gfx/color_utils.h"
29 #include "ui/gfx/insets.h"
30 #include "ui/gfx/path.h"
31 #include "unicode/ubidi.h" 31 #include "unicode/ubidi.h"
32 #include "views/controls/button/text_button.h" 32 #include "views/controls/button/text_button.h"
33 #include "views/controls/label.h" 33 #include "views/controls/label.h"
34 #include "views/layout/grid_layout.h" 34 #include "views/layout/grid_layout.h"
35 #include "views/layout/layout_constants.h" 35 #include "views/layout/layout_constants.h"
36 #include "views/painter.h" 36 #include "views/painter.h"
37 #include "views/widget/widget.h" 37 #include "views/widget/widget.h"
38 #include "views/window/window.h" 38 #include "views/window/window.h"
39 39
40 #if defined(OS_WIN) 40 #if defined(OS_WIN)
41 #include <commctrl.h> 41 #include <commctrl.h>
42 #include <dwmapi.h> 42 #include <dwmapi.h>
43 #include <objidl.h> 43 #include <objidl.h>
44 44
45 #include "base/win/scoped_gdi_object.h" 45 #include "base/win/scoped_gdi_object.h"
46 #include "views/widget/widget_win.h" 46 #include "views/widget/widget_win.h"
47 #endif 47 #endif
48 48
49 #if defined(OS_LINUX) 49 #if defined(OS_LINUX)
50 #include "chrome/browser/ui/gtk/gtk_util.h" 50 #include "chrome/browser/ui/gtk/gtk_util.h"
51 #include "gfx/skia_utils_gtk.h" 51 #include "ui/gfx/skia_utils_gtk.h"
52 #endif 52 #endif
53 53
54 namespace { 54 namespace {
55 55
56 enum ResultViewState { 56 enum ResultViewState {
57 NORMAL = 0, 57 NORMAL = 0,
58 SELECTED, 58 SELECTED,
59 HOVERED, 59 HOVERED,
60 NUM_STATES 60 NUM_STATES
61 }; 61 };
(...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 opt_in_view_ = NULL; 1201 opt_in_view_ = NULL;
1202 PromoCounter* counter = model_->profile()->GetInstantPromoCounter(); 1202 PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
1203 DCHECK(counter); 1203 DCHECK(counter);
1204 counter->Hide(); 1204 counter->Hide();
1205 if (opt_in) { 1205 if (opt_in) {
1206 browser::ShowInstantConfirmDialogIfNecessary( 1206 browser::ShowInstantConfirmDialogIfNecessary(
1207 location_bar_->GetWindow()->GetNativeWindow(), model_->profile()); 1207 location_bar_->GetWindow()->GetNativeWindow(), model_->profile());
1208 } 1208 }
1209 UpdatePopupAppearance(); 1209 UpdatePopupAppearance();
1210 } 1210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698