OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #import "base/mac/mac_util.h" | 8 #import "base/mac/mac_util.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h" | 41 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h" |
42 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" | 42 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" |
43 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 43 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
45 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" | 45 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" |
46 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" | 46 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" |
47 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" | 47 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" |
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 48 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
49 #include "chrome/common/pref_names.h" | 49 #include "chrome/common/pref_names.h" |
50 #include "chrome/grit/chromium_strings.h" | 50 #include "chrome/grit/chromium_strings.h" |
51 #include "chrome/grit/theme_resources.h" | |
52 #include "components/bookmarks/common/bookmark_pref_names.h" | 51 #include "components/bookmarks/common/bookmark_pref_names.h" |
53 #include "components/grit/components_scaled_resources.h" | |
54 #import "components/omnibox/browser/omnibox_popup_model.h" | 52 #import "components/omnibox/browser/omnibox_popup_model.h" |
55 #include "components/prefs/pref_service.h" | 53 #include "components/prefs/pref_service.h" |
56 #include "components/search_engines/template_url.h" | 54 #include "components/search_engines/template_url.h" |
57 #include "components/search_engines/template_url_service.h" | 55 #include "components/search_engines/template_url_service.h" |
58 #include "components/toolbar/vector_icons.h" | 56 #include "components/toolbar/vector_icons.h" |
59 #include "components/translate/core/browser/language_state.h" | 57 #include "components/translate/core/browser/language_state.h" |
60 #include "components/variations/variations_associated_data.h" | 58 #include "components/variations/variations_associated_data.h" |
61 #include "components/zoom/zoom_controller.h" | 59 #include "components/zoom/zoom_controller.h" |
62 #include "components/zoom/zoom_event_manager.h" | 60 #include "components/zoom/zoom_event_manager.h" |
63 #include "content/public/browser/web_contents.h" | 61 #include "content/public/browser/web_contents.h" |
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
804 OnDecorationsChanged(); | 802 OnDecorationsChanged(); |
805 } | 803 } |
806 | 804 |
807 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { | 805 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { |
808 std::vector<LocationBarDecoration*> decorations = GetDecorations(); | 806 std::vector<LocationBarDecoration*> decorations = GetDecorations(); |
809 std::vector<NSView*> views; | 807 std::vector<NSView*> views; |
810 for (auto* decoration : decorations) | 808 for (auto* decoration : decorations) |
811 views.push_back(decoration->GetAccessibilityView()); | 809 views.push_back(decoration->GetAccessibilityView()); |
812 return views; | 810 return views; |
813 } | 811 } |
OLD | NEW |