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 |
8 #if defined(OS_WIN) | 8 #if defined(OS_WIN) |
9 #include <atlbase.h> // NOLINT | 9 #include <atlbase.h> // NOLINT |
10 #include <atlwin.h> // NOLINT | 10 #include <atlwin.h> // NOLINT |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
22 #include "base/strings/string_util.h" | 22 #include "base/strings/string_util.h" |
23 #include "chrome/browser/ui/layout_constants.h" | 23 #include "chrome/browser/ui/layout_constants.h" |
24 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 24 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
25 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" | 25 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" |
26 #include "chrome/grit/generated_resources.h" | 26 #include "chrome/grit/generated_resources.h" |
27 #include "components/omnibox/browser/omnibox_popup_model.h" | 27 #include "components/omnibox/browser/omnibox_popup_model.h" |
28 #include "grit/components_scaled_resources.h" | 28 #include "grit/components_scaled_resources.h" |
29 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
30 #include "third_party/skia/include/core/SkColor.h" | 30 #include "third_party/skia/include/core/SkColor.h" |
| 31 #include "ui/accessibility/ax_enums.h" |
31 #include "ui/accessibility/ax_view_state.h" | 32 #include "ui/accessibility/ax_view_state.h" |
32 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
33 #include "ui/base/material_design/material_design_controller.h" | 34 #include "ui/base/material_design/material_design_controller.h" |
34 #include "ui/base/resource/resource_bundle.h" | 35 #include "ui/base/resource/resource_bundle.h" |
35 #include "ui/base/theme_provider.h" | 36 #include "ui/base/theme_provider.h" |
36 #include "ui/gfx/canvas.h" | 37 #include "ui/gfx/canvas.h" |
37 #include "ui/gfx/color_palette.h" | 38 #include "ui/gfx/color_palette.h" |
38 #include "ui/gfx/color_utils.h" | 39 #include "ui/gfx/color_utils.h" |
39 #include "ui/gfx/image/image.h" | 40 #include "ui/gfx/image/image.h" |
40 #include "ui/gfx/paint_vector_icon.h" | 41 #include "ui/gfx/paint_vector_icon.h" |
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
832 | 833 |
833 int OmniboxResultView::StartMargin() const { | 834 int OmniboxResultView::StartMargin() const { |
834 return ui::MaterialDesignController::IsModeMaterial() ? | 835 return ui::MaterialDesignController::IsModeMaterial() ? |
835 model_->start_margin() : 0; | 836 model_->start_margin() : 0; |
836 } | 837 } |
837 | 838 |
838 int OmniboxResultView::EndMargin() const { | 839 int OmniboxResultView::EndMargin() const { |
839 return ui::MaterialDesignController::IsModeMaterial() ? | 840 return ui::MaterialDesignController::IsModeMaterial() ? |
840 model_->end_margin() : 0; | 841 model_->end_margin() : 0; |
841 } | 842 } |
OLD | NEW |