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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 415073003: Move omnibox icons to components (1/2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Autocomplete -> Omnibox Created 6 years, 5 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/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "chrome/common/pref_names.h" 63 #include "chrome/common/pref_names.h"
64 #include "components/search_engines/template_url.h" 64 #include "components/search_engines/template_url.h"
65 #include "components/search_engines/template_url_service.h" 65 #include "components/search_engines/template_url_service.h"
66 #include "components/translate/core/browser/language_state.h" 66 #include "components/translate/core/browser/language_state.h"
67 #include "content/public/browser/notification_service.h" 67 #include "content/public/browser/notification_service.h"
68 #include "content/public/browser/render_widget_host_view.h" 68 #include "content/public/browser/render_widget_host_view.h"
69 #include "content/public/browser/web_contents.h" 69 #include "content/public/browser/web_contents.h"
70 #include "extensions/browser/extension_system.h" 70 #include "extensions/browser/extension_system.h"
71 #include "extensions/common/feature_switch.h" 71 #include "extensions/common/feature_switch.h"
72 #include "extensions/common/permissions/permissions_data.h" 72 #include "extensions/common/permissions/permissions_data.h"
73 #include "grit/component_scaled_resources.h"
73 #include "grit/generated_resources.h" 74 #include "grit/generated_resources.h"
74 #include "grit/theme_resources.h" 75 #include "grit/theme_resources.h"
75 #include "ui/accessibility/ax_view_state.h" 76 #include "ui/accessibility/ax_view_state.h"
76 #include "ui/base/dragdrop/drag_drop_types.h" 77 #include "ui/base/dragdrop/drag_drop_types.h"
77 #include "ui/base/l10n/l10n_util.h" 78 #include "ui/base/l10n/l10n_util.h"
78 #include "ui/base/resource/resource_bundle.h" 79 #include "ui/base/resource/resource_bundle.h"
79 #include "ui/base/theme_provider.h" 80 #include "ui/base/theme_provider.h"
80 #include "ui/events/event.h" 81 #include "ui/events/event.h"
81 #include "ui/gfx/animation/slide_animation.h" 82 #include "ui/gfx/animation/slide_animation.h"
82 #include "ui/gfx/canvas.h" 83 #include "ui/gfx/canvas.h"
(...skipping 1703 matching lines...) Expand 10 before | Expand all | Expand 10 after
1786 1787
1787 void LocationBarView::ModelChanged(const SearchModel::State& old_state, 1788 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
1788 const SearchModel::State& new_state) { 1789 const SearchModel::State& new_state) {
1789 const bool visible = !GetToolbarModel()->input_in_progress() && 1790 const bool visible = !GetToolbarModel()->input_in_progress() &&
1790 new_state.voice_search_supported; 1791 new_state.voice_search_supported;
1791 if (mic_search_view_->visible() != visible) { 1792 if (mic_search_view_->visible() != visible) {
1792 mic_search_view_->SetVisible(visible); 1793 mic_search_view_->SetVisible(visible);
1793 Layout(); 1794 Layout();
1794 } 1795 }
1795 } 1796 }
1796
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_impl.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698