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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 #include "components/toolbar/toolbar_model.h" | 62 #include "components/toolbar/toolbar_model.h" |
63 #include "components/translate/core/browser/language_state.h" | 63 #include "components/translate/core/browser/language_state.h" |
64 #include "components/zoom/zoom_controller.h" | 64 #include "components/zoom/zoom_controller.h" |
65 #include "components/zoom/zoom_event_manager.h" | 65 #include "components/zoom/zoom_event_manager.h" |
66 #include "content/public/browser/render_widget_host_view.h" | 66 #include "content/public/browser/render_widget_host_view.h" |
67 #include "content/public/browser/web_contents.h" | 67 #include "content/public/browser/web_contents.h" |
68 #include "extensions/browser/extension_registry.h" | 68 #include "extensions/browser/extension_registry.h" |
69 #include "extensions/common/feature_switch.h" | 69 #include "extensions/common/feature_switch.h" |
70 #include "grit/components_scaled_resources.h" | 70 #include "grit/components_scaled_resources.h" |
71 #include "grit/theme_resources.h" | 71 #include "grit/theme_resources.h" |
| 72 #include "ui/accessibility/ax_enums.h" |
72 #include "ui/accessibility/ax_view_state.h" | 73 #include "ui/accessibility/ax_view_state.h" |
73 #include "ui/base/dragdrop/drag_drop_types.h" | 74 #include "ui/base/dragdrop/drag_drop_types.h" |
74 #include "ui/base/material_design/material_design_controller.h" | 75 #include "ui/base/material_design/material_design_controller.h" |
75 #include "ui/base/resource/resource_bundle.h" | 76 #include "ui/base/resource/resource_bundle.h" |
76 #include "ui/base/theme_provider.h" | 77 #include "ui/base/theme_provider.h" |
77 #include "ui/compositor/paint_recorder.h" | 78 #include "ui/compositor/paint_recorder.h" |
78 #include "ui/events/event.h" | 79 #include "ui/events/event.h" |
79 #include "ui/gfx/animation/slide_animation.h" | 80 #include "ui/gfx/animation/slide_animation.h" |
80 #include "ui/gfx/canvas.h" | 81 #include "ui/gfx/canvas.h" |
81 #include "ui/gfx/color_palette.h" | 82 #include "ui/gfx/color_palette.h" |
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1389 // LocationBarView, private TemplateURLServiceObserver implementation: | 1390 // LocationBarView, private TemplateURLServiceObserver implementation: |
1390 | 1391 |
1391 void LocationBarView::OnTemplateURLServiceChanged() { | 1392 void LocationBarView::OnTemplateURLServiceChanged() { |
1392 template_url_service_->RemoveObserver(this); | 1393 template_url_service_->RemoveObserver(this); |
1393 template_url_service_ = nullptr; | 1394 template_url_service_ = nullptr; |
1394 // If the browser is no longer active, let's not show the info bubble, as this | 1395 // If the browser is no longer active, let's not show the info bubble, as this |
1395 // would make the browser the active window again. | 1396 // would make the browser the active window again. |
1396 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive()) | 1397 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive()) |
1397 ShowFirstRunBubble(); | 1398 ShowFirstRunBubble(); |
1398 } | 1399 } |
OLD | NEW |