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

Side by Side Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rect_f.h Created 5 years, 11 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
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/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/gfx/rect.h" 26 #include "ui/gfx/geometry/rect.h"
27 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 27 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
28 #include "ui/gfx/text_elider.h" 28 #include "ui/gfx/text_elider.h"
29 29
30 namespace { 30 namespace {
31 31
32 // 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
33 // by the font. 33 // by the font.
34 const CGFloat kCellHeightAdjust = 6.0; 34 const CGFloat kCellHeightAdjust = 6.0;
35 35
36 // Padding between matrix and the top and bottom of the popup window. 36 // Padding between matrix and the top and bottom of the popup window.
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 329 }
330 330
331 void OmniboxPopupViewMac::OpenURLForRow(size_t row, 331 void OmniboxPopupViewMac::OpenURLForRow(size_t row,
332 WindowOpenDisposition disposition) { 332 WindowOpenDisposition disposition) {
333 size_t start_match = model_->result().ShouldHideTopMatch() ? 1 : 0; 333 size_t start_match = model_->result().ShouldHideTopMatch() ? 1 : 0;
334 row += start_match; 334 row += start_match;
335 DCHECK_LT(row, GetResult().size()); 335 DCHECK_LT(row, GetResult().size());
336 omnibox_view_->OpenMatch(GetResult().match_at(row), disposition, GURL(), 336 omnibox_view_->OpenMatch(GetResult().match_at(row), disposition, GURL(),
337 base::string16(), row); 337 base::string16(), row);
338 } 338 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698