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/cocoa/omnibox/omnibox_popup_view_mac.h" | 5 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
11 #include "chrome/browser/search/search.h" | 11 #include "chrome/browser/search/search.h" |
12 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 12 #include "chrome/browser/ui/cocoa/browser_window_controller.h" |
13 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" | 13 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" |
14 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view.h" | 14 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view.h" |
15 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 15 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
16 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" | 16 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" |
17 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 17 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
18 #include "components/omnibox/autocomplete_match.h" | 18 #include "components/omnibox/autocomplete_match.h" |
19 #include "components/omnibox/autocomplete_match_type.h" | 19 #include "components/omnibox/autocomplete_match_type.h" |
20 #include "grit/theme_resources.h" | 20 #include "grit/theme_resources.h" |
21 #include "skia/ext/skia_utils_mac.h" | 21 #include "skia/ext/skia_utils_mac.h" |
22 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h
" | 22 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h
" |
23 #import "ui/base/cocoa/cocoa_base_utils.h" | 23 #import "ui/base/cocoa/cocoa_base_utils.h" |
24 #import "ui/base/cocoa/flipped_view.h" | 24 #import "ui/base/cocoa/flipped_view.h" |
25 #include "ui/base/cocoa/window_size_constants.h" | 25 #include "ui/base/cocoa/window_size_constants.h" |
26 #include "ui/base/resource/resource_bundle.h" | |
27 #include "ui/gfx/rect.h" | 26 #include "ui/gfx/rect.h" |
28 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 27 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
29 #include "ui/gfx/text_elider.h" | 28 #include "ui/gfx/text_elider.h" |
30 | 29 |
31 namespace { | 30 namespace { |
32 | 31 |
33 // How much to adjust the cell sizing up from the default determined | 32 // How much to adjust the cell sizing up from the default determined |
34 // by the font. | 33 // by the font. |
35 const CGFloat kCellHeightAdjust = 6.0; | 34 const CGFloat kCellHeightAdjust = 6.0; |
36 | 35 |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 } | 329 } |
331 | 330 |
332 void OmniboxPopupViewMac::OpenURLForRow(size_t row, | 331 void OmniboxPopupViewMac::OpenURLForRow(size_t row, |
333 WindowOpenDisposition disposition) { | 332 WindowOpenDisposition disposition) { |
334 size_t start_match = model_->result().ShouldHideTopMatch() ? 1 : 0; | 333 size_t start_match = model_->result().ShouldHideTopMatch() ? 1 : 0; |
335 row += start_match; | 334 row += start_match; |
336 DCHECK_LT(row, GetResult().size()); | 335 DCHECK_LT(row, GetResult().size()); |
337 omnibox_view_->OpenMatch(GetResult().match_at(row), disposition, GURL(), | 336 omnibox_view_->OpenMatch(GetResult().match_at(row), disposition, GURL(), |
338 base::string16(), row); | 337 base::string16(), row); |
339 } | 338 } |
OLD | NEW |