| 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 #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/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 40 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
| 41 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" | 41 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" |
| 42 #include "chrome/browser/ui/views/location_bar/star_view.h" | 42 #include "chrome/browser/ui/views/location_bar/star_view.h" |
| 43 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" | 43 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" |
| 44 #include "chrome/browser/ui/views/location_bar/zoom_view.h" | 44 #include "chrome/browser/ui/views/location_bar/zoom_view.h" |
| 45 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" | 45 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" |
| 46 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h" | 46 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h" |
| 47 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" | 47 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" |
| 48 #include "chrome/browser/ui/views/translate/translate_icon_view.h" | 48 #include "chrome/browser/ui/views/translate/translate_icon_view.h" |
| 49 #include "chrome/grit/chromium_strings.h" | 49 #include "chrome/grit/chromium_strings.h" |
| 50 #include "chrome/grit/generated_resources.h" | |
| 51 #include "chrome/grit/theme_resources.h" | |
| 52 #include "components/bookmarks/common/bookmark_pref_names.h" | 50 #include "components/bookmarks/common/bookmark_pref_names.h" |
| 53 #include "components/favicon/content/content_favicon_driver.h" | 51 #include "components/favicon/content/content_favicon_driver.h" |
| 54 #include "components/grit/components_scaled_resources.h" | |
| 55 #include "components/omnibox/browser/omnibox_popup_model.h" | 52 #include "components/omnibox/browser/omnibox_popup_model.h" |
| 56 #include "components/omnibox/browser/omnibox_popup_view.h" | 53 #include "components/omnibox/browser/omnibox_popup_view.h" |
| 57 #include "components/prefs/pref_service.h" | 54 #include "components/prefs/pref_service.h" |
| 58 #include "components/search_engines/template_url.h" | 55 #include "components/search_engines/template_url.h" |
| 59 #include "components/search_engines/template_url_service.h" | 56 #include "components/search_engines/template_url_service.h" |
| 60 #include "components/toolbar/toolbar_model.h" | 57 #include "components/toolbar/toolbar_model.h" |
| 61 #include "components/translate/core/browser/language_state.h" | 58 #include "components/translate/core/browser/language_state.h" |
| 62 #include "components/variations/variations_associated_data.h" | 59 #include "components/variations/variations_associated_data.h" |
| 63 #include "components/zoom/zoom_controller.h" | 60 #include "components/zoom/zoom_controller.h" |
| 64 #include "components/zoom/zoom_event_manager.h" | 61 #include "components/zoom/zoom_event_manager.h" |
| (...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1047 // LocationBarView, private TemplateURLServiceObserver implementation: | 1044 // LocationBarView, private TemplateURLServiceObserver implementation: |
| 1048 | 1045 |
| 1049 void LocationBarView::OnTemplateURLServiceChanged() { | 1046 void LocationBarView::OnTemplateURLServiceChanged() { |
| 1050 template_url_service_->RemoveObserver(this); | 1047 template_url_service_->RemoveObserver(this); |
| 1051 template_url_service_ = nullptr; | 1048 template_url_service_ = nullptr; |
| 1052 // If the browser is no longer active, let's not show the info bubble, as this | 1049 // If the browser is no longer active, let's not show the info bubble, as this |
| 1053 // would make the browser the active window again. | 1050 // would make the browser the active window again. |
| 1054 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive()) | 1051 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive()) |
| 1055 ShowFirstRunBubble(); | 1052 ShowFirstRunBubble(); |
| 1056 } | 1053 } |
| OLD | NEW |