OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/autocomplete/autocomplete_popup_view_win.h" | 5 #include "chrome/browser/autocomplete/autocomplete_popup_view_win.h" |
6 | 6 |
7 // TODO(deanm): Clean up these includes, not going to fight it now. | 7 // TODO(deanm): Clean up these includes, not going to fight it now. |
8 #include <atlbase.h> | 8 #include <atlbase.h> |
9 #include <atlapp.h> | 9 #include <atlapp.h> |
10 #include <atlcrack.h> | 10 #include <atlcrack.h> |
11 #include <atlmisc.h> | 11 #include <atlmisc.h> |
12 #include <cmath> | 12 #include <cmath> |
13 | 13 |
| 14 #include "app/l10n_util.h" |
14 #include "app/resource_bundle.h" | 15 #include "app/resource_bundle.h" |
15 #include "base/command_line.h" | 16 #include "base/command_line.h" |
16 #include "base/string_util.h" | 17 #include "base/string_util.h" |
17 #include "base/win_util.h" | 18 #include "base/win_util.h" |
18 #include "chrome/browser/autocomplete/autocomplete.h" | 19 #include "chrome/browser/autocomplete/autocomplete.h" |
19 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 20 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
20 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" | 21 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
21 #include "chrome/browser/browser_process.h" | 22 #include "chrome/browser/browser_process.h" |
22 #include "chrome/browser/net/dns_global.h" | 23 #include "chrome/browser/net/dns_global.h" |
23 #include "chrome/browser/profile.h" | 24 #include "chrome/browser/profile.h" |
24 #include "chrome/browser/search_engines/template_url.h" | 25 #include "chrome/browser/search_engines/template_url.h" |
25 #include "chrome/browser/search_engines/template_url_model.h" | 26 #include "chrome/browser/search_engines/template_url_model.h" |
26 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" | 27 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" |
27 #include "chrome/browser/views/location_bar_view.h" | 28 #include "chrome/browser/views/location_bar_view.h" |
28 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
29 #include "chrome/common/gfx/chrome_canvas.h" | 30 #include "chrome/common/gfx/chrome_canvas.h" |
30 #include "chrome/common/gfx/chrome_font.h" | 31 #include "chrome/common/gfx/chrome_font.h" |
31 #include "chrome/common/l10n_util.h" | |
32 #include "chrome/common/notification_service.h" | 32 #include "chrome/common/notification_service.h" |
33 #include "chrome/views/view.h" | 33 #include "chrome/views/view.h" |
34 #include "grit/theme_resources.h" | 34 #include "grit/theme_resources.h" |
35 #include "third_party/icu38/public/common/unicode/ubidi.h" | 35 #include "third_party/icu38/public/common/unicode/ubidi.h" |
36 | 36 |
37 // Padding between text and the star indicator, in pixels. | 37 // Padding between text and the star indicator, in pixels. |
38 static const int kStarPadding = 4; | 38 static const int kStarPadding = 4; |
39 | 39 |
40 // This class implements a utility used for mirroring x-coordinates when the | 40 // This class implements a utility used for mirroring x-coordinates when the |
41 // application language is a right-to-left one. | 41 // application language is a right-to-left one. |
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 AutocompleteEditViewWin* edit_view, | 684 AutocompleteEditViewWin* edit_view, |
685 AutocompleteEditModel* edit_model, | 685 AutocompleteEditModel* edit_model, |
686 Profile* profile, | 686 Profile* profile, |
687 AutocompletePopupPositioner* popup_positioner) { | 687 AutocompletePopupPositioner* popup_positioner) { |
688 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableOmnibox2)) { | 688 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableOmnibox2)) { |
689 return new AutocompletePopupContentsView(font, edit_view, edit_model, | 689 return new AutocompletePopupContentsView(font, edit_view, edit_model, |
690 profile, popup_positioner); | 690 profile, popup_positioner); |
691 } | 691 } |
692 return new AutocompletePopupViewWin(font, edit_view, edit_model, profile); | 692 return new AutocompletePopupViewWin(font, edit_view, edit_model, profile); |
693 } | 693 } |
OLD | NEW |