| 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 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <atlbase.h> // NOLINT | 8 #include <atlbase.h> // NOLINT |
| 9 #include <atlwin.h> // NOLINT | 9 #include <atlwin.h> // NOLINT |
| 10 #endif | 10 #endif |
| 11 | 11 |
| 12 #include "base/macros.h" |
| 12 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" | 13 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" |
| 13 | 14 |
| 14 #include <algorithm> // NOLINT | 15 #include <algorithm> // NOLINT |
| 15 | 16 |
| 16 #include "base/i18n/bidi_line_iterator.h" | 17 #include "base/i18n/bidi_line_iterator.h" |
| 17 #include "base/strings/string_number_conversions.h" | 18 #include "base/strings/string_number_conversions.h" |
| 18 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
| 19 #include "chrome/browser/ui/layout_constants.h" | 20 #include "chrome/browser/ui/layout_constants.h" |
| 20 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 21 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 21 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" | 22 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 | 819 |
| 819 int OmniboxResultView::StartMargin() const { | 820 int OmniboxResultView::StartMargin() const { |
| 820 return ui::MaterialDesignController::IsModeMaterial() ? | 821 return ui::MaterialDesignController::IsModeMaterial() ? |
| 821 model_->start_margin() : 0; | 822 model_->start_margin() : 0; |
| 822 } | 823 } |
| 823 | 824 |
| 824 int OmniboxResultView::EndMargin() const { | 825 int OmniboxResultView::EndMargin() const { |
| 825 return ui::MaterialDesignController::IsModeMaterial() ? | 826 return ui::MaterialDesignController::IsModeMaterial() ? |
| 826 model_->end_margin() : 0; | 827 model_->end_margin() : 0; |
| 827 } | 828 } |
| OLD | NEW |