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

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

Issue 296003014: Revert 272217 "LanguageState should be owned by TranslateManager" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" 57 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
58 #include "chrome/browser/ui/views/location_bar/star_view.h" 58 #include "chrome/browser/ui/views/location_bar/star_view.h"
59 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h" 59 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h"
60 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" 60 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
61 #include "chrome/browser/ui/views/location_bar/zoom_view.h" 61 #include "chrome/browser/ui/views/location_bar/zoom_view.h"
62 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" 62 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
63 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h" 63 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
64 #include "chrome/browser/ui/zoom/zoom_controller.h" 64 #include "chrome/browser/ui/zoom/zoom_controller.h"
65 #include "chrome/common/chrome_switches.h" 65 #include "chrome/common/chrome_switches.h"
66 #include "chrome/common/pref_names.h" 66 #include "chrome/common/pref_names.h"
67 #include "components/translate/core/browser/language_state.h"
68 #include "content/public/browser/notification_service.h" 67 #include "content/public/browser/notification_service.h"
69 #include "content/public/browser/render_widget_host_view.h" 68 #include "content/public/browser/render_widget_host_view.h"
70 #include "content/public/browser/web_contents.h" 69 #include "content/public/browser/web_contents.h"
71 #include "extensions/browser/extension_system.h" 70 #include "extensions/browser/extension_system.h"
72 #include "extensions/common/feature_switch.h" 71 #include "extensions/common/feature_switch.h"
73 #include "extensions/common/permissions/permissions_data.h" 72 #include "extensions/common/permissions/permissions_data.h"
74 #include "grit/generated_resources.h" 73 #include "grit/generated_resources.h"
75 #include "grit/theme_resources.h" 74 #include "grit/theme_resources.h"
76 #include "ui/accessibility/ax_view_state.h" 75 #include "ui/accessibility/ax_view_state.h"
77 #include "ui/base/dragdrop/drag_drop_types.h" 76 #include "ui/base/dragdrop/drag_drop_types.h"
(...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after
1671 void LocationBarView::ModelChanged(const SearchModel::State& old_state, 1670 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
1672 const SearchModel::State& new_state) { 1671 const SearchModel::State& new_state) {
1673 const bool visible = !GetToolbarModel()->input_in_progress() && 1672 const bool visible = !GetToolbarModel()->input_in_progress() &&
1674 new_state.voice_search_supported; 1673 new_state.voice_search_supported;
1675 if (mic_search_view_->visible() != visible) { 1674 if (mic_search_view_->visible() != visible) {
1676 mic_search_view_->SetVisible(visible); 1675 mic_search_view_->SetVisible(visible);
1677 Layout(); 1676 Layout();
1678 } 1677 }
1679 } 1678 }
1680 1679
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698