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/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
10 #import "base/mac/sdk_forward_declarations.h" | 10 #import "base/mac/sdk_forward_declarations.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
12 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
13 #include "chrome/browser/search/search.h" | 13 #include "chrome/browser/search/search.h" |
14 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 14 #include "chrome/browser/ui/cocoa/browser_window_controller.h" |
15 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" | 15 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" |
16 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view.h" | 16 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view.h" |
17 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 17 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
18 #include "chrome/grit/theme_resources.h" | |
19 #include "components/omnibox/browser/autocomplete_match.h" | 18 #include "components/omnibox/browser/autocomplete_match.h" |
20 #include "components/omnibox/browser/autocomplete_match_type.h" | 19 #include "components/omnibox/browser/autocomplete_match_type.h" |
21 #include "components/omnibox/browser/omnibox_edit_model.h" | 20 #include "components/omnibox/browser/omnibox_edit_model.h" |
22 #include "components/omnibox/browser/omnibox_popup_model.h" | 21 #include "components/omnibox/browser/omnibox_popup_model.h" |
23 #include "components/toolbar/vector_icons.h" | 22 #include "components/toolbar/vector_icons.h" |
24 #include "skia/ext/skia_utils_mac.h" | 23 #include "skia/ext/skia_utils_mac.h" |
25 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h
" | 24 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h
" |
26 #import "ui/base/cocoa/cocoa_base_utils.h" | 25 #import "ui/base/cocoa/cocoa_base_utils.h" |
27 #import "ui/base/cocoa/flipped_view.h" | 26 #import "ui/base/cocoa/flipped_view.h" |
28 #include "ui/base/cocoa/window_size_constants.h" | 27 #include "ui/base/cocoa/window_size_constants.h" |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 return NSImageFromImageSkia( | 339 return NSImageFromImageSkia( |
341 gfx::CreateVectorIcon(vector_icon, kIconSize, icon_color)); | 340 gfx::CreateVectorIcon(vector_icon, kIconSize, icon_color)); |
342 } | 341 } |
343 | 342 |
344 void OmniboxPopupViewMac::OpenURLForRow(size_t row, | 343 void OmniboxPopupViewMac::OpenURLForRow(size_t row, |
345 WindowOpenDisposition disposition) { | 344 WindowOpenDisposition disposition) { |
346 DCHECK_LT(row, GetResult().size()); | 345 DCHECK_LT(row, GetResult().size()); |
347 omnibox_view_->OpenMatch(GetResult().match_at(row), disposition, GURL(), | 346 omnibox_view_->OpenMatch(GetResult().match_at(row), disposition, GURL(), |
348 base::string16(), row); | 347 base::string16(), row); |
349 } | 348 } |
OLD | NEW |