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 // For WinDDK ATL compatibility, these ATL headers must come first. | 5 // For WinDDK ATL compatibility, these ATL headers must come first. |
6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 |
7 #if defined(OS_WIN) | 8 #if defined(OS_WIN) |
8 #include <atlbase.h> // NOLINT | 9 #include <atlbase.h> // NOLINT |
9 #include <atlwin.h> // NOLINT | 10 #include <atlwin.h> // NOLINT |
10 #endif | 11 #endif |
11 | 12 |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" | 14 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" |
14 | 15 |
| 16 #include <limits.h> |
| 17 |
15 #include <algorithm> // NOLINT | 18 #include <algorithm> // NOLINT |
16 | 19 |
17 #include "base/i18n/bidi_line_iterator.h" | 20 #include "base/i18n/bidi_line_iterator.h" |
18 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
19 #include "base/strings/string_util.h" | 22 #include "base/strings/string_util.h" |
20 #include "chrome/browser/ui/layout_constants.h" | 23 #include "chrome/browser/ui/layout_constants.h" |
21 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 24 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
22 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" | 25 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" |
23 #include "chrome/grit/generated_resources.h" | 26 #include "chrome/grit/generated_resources.h" |
24 #include "components/omnibox/browser/omnibox_popup_model.h" | 27 #include "components/omnibox/browser/omnibox_popup_model.h" |
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
819 | 822 |
820 int OmniboxResultView::StartMargin() const { | 823 int OmniboxResultView::StartMargin() const { |
821 return ui::MaterialDesignController::IsModeMaterial() ? | 824 return ui::MaterialDesignController::IsModeMaterial() ? |
822 model_->start_margin() : 0; | 825 model_->start_margin() : 0; |
823 } | 826 } |
824 | 827 |
825 int OmniboxResultView::EndMargin() const { | 828 int OmniboxResultView::EndMargin() const { |
826 return ui::MaterialDesignController::IsModeMaterial() ? | 829 return ui::MaterialDesignController::IsModeMaterial() ? |
827 model_->end_margin() : 0; | 830 model_->end_margin() : 0; |
828 } | 831 } |
OLD | NEW |