| 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 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #import "base/mac/mac_util.h" | 9 #import "base/mac/mac_util.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 save_credit_card_decoration_( | 114 save_credit_card_decoration_( |
| 115 new SaveCreditCardDecoration(command_updater)), | 115 new SaveCreditCardDecoration(command_updater)), |
| 116 star_decoration_(new StarDecoration(command_updater)), | 116 star_decoration_(new StarDecoration(command_updater)), |
| 117 translate_decoration_(new TranslateDecoration(command_updater)), | 117 translate_decoration_(new TranslateDecoration(command_updater)), |
| 118 zoom_decoration_(new ZoomDecoration(this)), | 118 zoom_decoration_(new ZoomDecoration(this)), |
| 119 keyword_hint_decoration_(new KeywordHintDecoration()), | 119 keyword_hint_decoration_(new KeywordHintDecoration()), |
| 120 manage_passwords_decoration_( | 120 manage_passwords_decoration_( |
| 121 new ManagePasswordsDecoration(command_updater, this)), | 121 new ManagePasswordsDecoration(command_updater, this)), |
| 122 browser_(browser), | 122 browser_(browser), |
| 123 location_bar_visible_(true), | 123 location_bar_visible_(true), |
| 124 should_show_secure_verbose_(false), | 124 should_show_secure_verbose_(true), |
| 125 should_animate_security_verbose_(false), | 125 should_animate_security_verbose_(true), |
| 126 is_width_available_for_security_verbose_(false), | 126 is_width_available_for_security_verbose_(false), |
| 127 weak_ptr_factory_(this) { | 127 weak_ptr_factory_(this) { |
| 128 ScopedVector<ContentSettingImageModel> models = | 128 ScopedVector<ContentSettingImageModel> models = |
| 129 ContentSettingImageModel::GenerateContentSettingImageModels(); | 129 ContentSettingImageModel::GenerateContentSettingImageModels(); |
| 130 for (ContentSettingImageModel* model : models.get()) { | 130 for (ContentSettingImageModel* model : models.get()) { |
| 131 // ContentSettingDecoration takes ownership of its model. | 131 // ContentSettingDecoration takes ownership of its model. |
| 132 content_setting_decorations_.push_back( | 132 content_setting_decorations_.push_back( |
| 133 new ContentSettingDecoration(model, this, profile)); | 133 new ContentSettingDecoration(model, this, profile)); |
| 134 } | 134 } |
| 135 models.weak_clear(); | 135 models.weak_clear(); |
| (...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 929 OnDecorationsChanged(); | 929 OnDecorationsChanged(); |
| 930 } | 930 } |
| 931 | 931 |
| 932 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { | 932 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { |
| 933 std::vector<LocationBarDecoration*> decorations = GetDecorations(); | 933 std::vector<LocationBarDecoration*> decorations = GetDecorations(); |
| 934 std::vector<NSView*> views; | 934 std::vector<NSView*> views; |
| 935 for (auto* decoration : decorations) | 935 for (auto* decoration : decorations) |
| 936 views.push_back(decoration->GetAccessibilityView()); | 936 views.push_back(decoration->GetAccessibilityView()); |
| 937 return views; | 937 return views; |
| 938 } | 938 } |
| OLD | NEW |