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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 8
9 #include "chrome/browser/search/search.h" 9 #include "chrome/browser/search/search.h"
10 #include "chrome/browser/themes/theme_properties.h" 10 #include "chrome/browser/themes/theme_properties.h"
11 #include "chrome/browser/ui/omnibox/omnibox_view.h" 11 #include "chrome/browser/ui/omnibox/omnibox_view.h"
12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
13 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" 13 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h"
14 #include "grit/ui_resources.h"
15 #include "ui/base/theme_provider.h" 14 #include "ui/base/theme_provider.h"
16 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
17 #include "ui/gfx/image/image.h" 16 #include "ui/gfx/image/image.h"
18 #include "ui/gfx/path.h" 17 #include "ui/gfx/path.h"
18 #include "ui/resources/grit/ui_resources.h"
19 #include "ui/views/controls/image_view.h" 19 #include "ui/views/controls/image_view.h"
20 #include "ui/views/view_targeter.h" 20 #include "ui/views/view_targeter.h"
21 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
22 #include "ui/views/window/non_client_view.h" 22 #include "ui/views/window/non_client_view.h"
23 #include "ui/wm/core/window_animations.h" 23 #include "ui/wm/core/window_animations.h"
24 24
25 // This is the number of pixels in the border image interior to the actual 25 // This is the number of pixels in the border image interior to the actual
26 // border. 26 // border.
27 const int kBorderInterior = 6; 27 const int kBorderInterior = 6;
28 28
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 size_t index = GetIndexForPoint(event.location()); 501 size_t index = GetIndexForPoint(event.location());
502 if (!HasMatchAt(index)) 502 if (!HasMatchAt(index))
503 return; 503 return;
504 omnibox_view_->OpenMatch(model_->result().match_at(index), disposition, 504 omnibox_view_->OpenMatch(model_->result().match_at(index), disposition,
505 GURL(), base::string16(), index); 505 GURL(), base::string16(), index);
506 } 506 }
507 507
508 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) { 508 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) {
509 return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i))); 509 return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i)));
510 } 510 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar_view.cc ('k') | chrome/browser/ui/views/panels/panel_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698