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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

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/views/omnibox/omnibox_popup_contents_view.h" 5 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
6 6
7 #include "chrome/browser/instant/search.h"
7 #include "chrome/browser/ui/omnibox/omnibox_popup_non_view.h" 8 #include "chrome/browser/ui/omnibox/omnibox_popup_non_view.h"
8 #include "chrome/browser/ui/omnibox/omnibox_view.h" 9 #include "chrome/browser/ui/omnibox/omnibox_view.h"
9 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 10 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
10 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" 11 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h"
11 #include "chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h" 12 #include "chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h"
12 #include "chrome/browser/ui/search/search.h"
13 #include "ui/base/theme_provider.h" 13 #include "ui/base/theme_provider.h"
14 #include "ui/gfx/canvas.h" 14 #include "ui/gfx/canvas.h"
15 #include "ui/gfx/image/image.h" 15 #include "ui/gfx/image/image.h"
16 #include "ui/gfx/path.h" 16 #include "ui/gfx/path.h"
17 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
18 18
19 #if defined(USE_AURA) 19 #if defined(USE_AURA)
20 #include "ui/views/corewm/window_animations.h" 20 #include "ui/views/corewm/window_animations.h"
21 #endif 21 #endif
22 22
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 void OmniboxPopupContentsView::OpenSelectedLine( 540 void OmniboxPopupContentsView::OpenSelectedLine(
541 const ui::LocatedEvent& event, 541 const ui::LocatedEvent& event,
542 WindowOpenDisposition disposition) { 542 WindowOpenDisposition disposition) {
543 size_t index = GetIndexForPoint(event.location()); 543 size_t index = GetIndexForPoint(event.location());
544 OpenIndex(index, disposition); 544 OpenIndex(index, disposition);
545 } 545 }
546 546
547 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) { 547 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) {
548 return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i))); 548 return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i)));
549 } 549 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698