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

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

Issue 1428423002: Remove setVoiceSearchSupported part of EmbeddedSearch SearchBox API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mac fix Created 5 years, 1 month 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 // 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
(...skipping 20 matching lines...) Expand all
31 #include "ui/base/theme_provider.h" 31 #include "ui/base/theme_provider.h"
32 #include "ui/gfx/canvas.h" 32 #include "ui/gfx/canvas.h"
33 #include "ui/gfx/color_palette.h" 33 #include "ui/gfx/color_palette.h"
34 #include "ui/gfx/color_utils.h" 34 #include "ui/gfx/color_utils.h"
35 #include "ui/gfx/image/image.h" 35 #include "ui/gfx/image/image.h"
36 #include "ui/gfx/paint_vector_icon.h" 36 #include "ui/gfx/paint_vector_icon.h"
37 #include "ui/gfx/range/range.h" 37 #include "ui/gfx/range/range.h"
38 #include "ui/gfx/render_text.h" 38 #include "ui/gfx/render_text.h"
39 #include "ui/gfx/text_utils.h" 39 #include "ui/gfx/text_utils.h"
40 #include "ui/gfx/vector_icons_public.h" 40 #include "ui/gfx/vector_icons_public.h"
41 #include "ui/native_theme/native_theme.h"
41 42
42 using ui::NativeTheme; 43 using ui::NativeTheme;
43 44
44 namespace { 45 namespace {
45 46
46 // A mapping from OmniboxResultView's ResultViewState/ColorKind types to 47 // A mapping from OmniboxResultView's ResultViewState/ColorKind types to
47 // NativeTheme colors. 48 // NativeTheme colors.
48 struct TranslationTable { 49 struct TranslationTable {
49 ui::NativeTheme::ColorId id; 50 ui::NativeTheme::ColorId id;
50 OmniboxResultView::ResultViewState state; 51 OmniboxResultView::ResultViewState state;
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 824
824 int OmniboxResultView::StartMargin() const { 825 int OmniboxResultView::StartMargin() const {
825 return ui::MaterialDesignController::IsModeMaterial() ? 826 return ui::MaterialDesignController::IsModeMaterial() ?
826 model_->start_margin() : 0; 827 model_->start_margin() : 0;
827 } 828 }
828 829
829 int OmniboxResultView::EndMargin() const { 830 int OmniboxResultView::EndMargin() const {
830 return ui::MaterialDesignController::IsModeMaterial() ? 831 return ui::MaterialDesignController::IsModeMaterial() ?
831 model_->end_margin() : 0; 832 model_->end_margin() : 0;
832 } 833 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698