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

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

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 9 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/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
11 #include "chrome/browser/autocomplete/autocomplete_match.h" 11 #include "chrome/browser/autocomplete/autocomplete_match.h"
12 #include "chrome/browser/instant/search.h"
12 #include "chrome/browser/ui/cocoa/event_utils.h" 13 #include "chrome/browser/ui/cocoa/event_utils.h"
13 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 14 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
14 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" 15 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
15 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" 16 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
16 #include "chrome/browser/ui/omnibox/omnibox_popup_non_view.h" 17 #include "chrome/browser/ui/omnibox/omnibox_popup_non_view.h"
17 #include "chrome/browser/ui/search/search.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "skia/ext/skia_utils_mac.h" 19 #include "skia/ext/skia_utils_mac.h"
20 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 20 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
21 #include "ui/base/cocoa/window_size_constants.h" 21 #include "ui/base/cocoa/window_size_constants.h"
22 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
23 #include "ui/base/text/text_elider.h" 23 #include "ui/base/text/text_elider.h"
24 #include "ui/gfx/rect.h" 24 #include "ui/gfx/rect.h"
25 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 25 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
26 26
27 // The size delta between the font used for the edit and the result 27 // The size delta between the font used for the edit and the result
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 xRadius:kPopupRoundingRadius 768 xRadius:kPopupRoundingRadius
769 yRadius:kPopupRoundingRadius]; 769 yRadius:kPopupRoundingRadius];
770 770
771 // Draw the matrix clipped to our border. 771 // Draw the matrix clipped to our border.
772 gfx::ScopedNSGraphicsContextSaveGState scopedGState; 772 gfx::ScopedNSGraphicsContextSaveGState scopedGState;
773 [path addClip]; 773 [path addClip];
774 [super drawRect:rect]; 774 [super drawRect:rect];
775 } 775 }
776 776
777 @end 777 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698