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/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 #include "chrome/browser/ui/views/location_bar/script_bubble_icon_view.h" | 53 #include "chrome/browser/ui/views/location_bar/script_bubble_icon_view.h" |
54 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" | 54 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" |
55 #include "chrome/browser/ui/views/location_bar/star_view.h" | 55 #include "chrome/browser/ui/views/location_bar/star_view.h" |
56 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h" | 56 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h" |
57 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" | 57 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" |
58 #include "chrome/browser/ui/views/location_bar/zoom_view.h" | 58 #include "chrome/browser/ui/views/location_bar/zoom_view.h" |
59 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 59 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
60 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" | 60 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" |
61 #include "chrome/browser/ui/zoom/zoom_controller.h" | 61 #include "chrome/browser/ui/zoom/zoom_controller.h" |
62 #include "chrome/common/chrome_switches.h" | 62 #include "chrome/common/chrome_switches.h" |
63 #include "chrome/common/extensions/feature_switch.h" | |
64 #include "chrome/common/pref_names.h" | 63 #include "chrome/common/pref_names.h" |
65 #include "content/public/browser/notification_service.h" | 64 #include "content/public/browser/notification_service.h" |
66 #include "content/public/browser/render_widget_host_view.h" | 65 #include "content/public/browser/render_widget_host_view.h" |
67 #include "content/public/browser/web_contents.h" | 66 #include "content/public/browser/web_contents.h" |
| 67 #include "extensions/common/feature_switch.h" |
68 #include "grit/generated_resources.h" | 68 #include "grit/generated_resources.h" |
69 #include "grit/theme_resources.h" | 69 #include "grit/theme_resources.h" |
70 #include "ui/base/accessibility/accessible_view_state.h" | 70 #include "ui/base/accessibility/accessible_view_state.h" |
71 #include "ui/base/dragdrop/drag_drop_types.h" | 71 #include "ui/base/dragdrop/drag_drop_types.h" |
72 #include "ui/base/l10n/l10n_util.h" | 72 #include "ui/base/l10n/l10n_util.h" |
73 #include "ui/base/layout.h" | 73 #include "ui/base/layout.h" |
74 #include "ui/base/resource/resource_bundle.h" | 74 #include "ui/base/resource/resource_bundle.h" |
75 #include "ui/base/theme_provider.h" | 75 #include "ui/base/theme_provider.h" |
76 #include "ui/events/event.h" | 76 #include "ui/events/event.h" |
77 #include "ui/gfx/canvas.h" | 77 #include "ui/gfx/canvas.h" |
(...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1565 bounds.Inset(-(horizontal_padding + 1) / 2, 0); | 1565 bounds.Inset(-(horizontal_padding + 1) / 2, 0); |
1566 location_bar_util::PaintExtensionActionBackground( | 1566 location_bar_util::PaintExtensionActionBackground( |
1567 *(*page_action_view)->image_view()->page_action(), | 1567 *(*page_action_view)->image_view()->page_action(), |
1568 tab_id, canvas, bounds, text_color, background_color); | 1568 tab_id, canvas, bounds, text_color, background_color); |
1569 } | 1569 } |
1570 } | 1570 } |
1571 | 1571 |
1572 void LocationBarView::AccessibilitySetValue(const string16& new_value) { | 1572 void LocationBarView::AccessibilitySetValue(const string16& new_value) { |
1573 location_entry_->SetUserText(new_value); | 1573 location_entry_->SetUserText(new_value); |
1574 } | 1574 } |
OLD | NEW |