Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 2430923010: Add a feature flag for the security verbose (Closed)
Patch Set: Fix for pkasting Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" 43 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
44 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" 44 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
45 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h" 45 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h"
46 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" 46 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
47 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 47 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
48 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 48 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
49 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 49 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
50 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 50 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
51 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" 51 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
52 #include "chrome/browser/ui/tabs/tab_strip_model.h" 52 #include "chrome/browser/ui/tabs/tab_strip_model.h"
53 #include "chrome/common/chrome_features.h"
53 #include "chrome/common/chrome_switches.h" 54 #include "chrome/common/chrome_switches.h"
54 #include "chrome/common/pref_names.h" 55 #include "chrome/common/pref_names.h"
55 #include "chrome/grit/theme_resources.h" 56 #include "chrome/grit/theme_resources.h"
56 #include "components/bookmarks/common/bookmark_pref_names.h" 57 #include "components/bookmarks/common/bookmark_pref_names.h"
57 #include "components/grit/components_scaled_resources.h" 58 #include "components/grit/components_scaled_resources.h"
58 #import "components/omnibox/browser/omnibox_popup_model.h" 59 #import "components/omnibox/browser/omnibox_popup_model.h"
59 #include "components/prefs/pref_service.h" 60 #include "components/prefs/pref_service.h"
60 #include "components/search_engines/template_url.h" 61 #include "components/search_engines/template_url.h"
61 #include "components/search_engines/template_url_service.h" 62 #include "components/search_engines/template_url_service.h"
62 #include "components/translate/core/browser/language_state.h" 63 #include "components/translate/core/browser/language_state.h"
64 #include "components/variations/variations_associated_data.h"
63 #include "components/zoom/zoom_controller.h" 65 #include "components/zoom/zoom_controller.h"
64 #include "components/zoom/zoom_event_manager.h" 66 #include "components/zoom/zoom_event_manager.h"
65 #include "content/public/browser/web_contents.h" 67 #include "content/public/browser/web_contents.h"
66 #include "extensions/browser/extension_system.h" 68 #include "extensions/browser/extension_system.h"
67 #include "extensions/common/extension.h" 69 #include "extensions/common/extension.h"
68 #include "skia/ext/skia_utils_mac.h" 70 #include "skia/ext/skia_utils_mac.h"
69 #import "ui/base/cocoa/cocoa_base_utils.h" 71 #import "ui/base/cocoa/cocoa_base_utils.h"
70 #include "ui/base/l10n/l10n_util_mac.h" 72 #include "ui/base/l10n/l10n_util_mac.h"
71 #include "ui/base/material_design/material_design_controller.h" 73 #include "ui/base/material_design/material_design_controller.h"
72 #include "ui/gfx/color_palette.h" 74 #include "ui/gfx/color_palette.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 base::Bind(&LocationBarViewMac::OnEditBookmarksEnabledChanged, 143 base::Bind(&LocationBarViewMac::OnEditBookmarksEnabledChanged,
142 base::Unretained(this))); 144 base::Unretained(this)));
143 145
144 zoom::ZoomEventManager::GetForBrowserContext(profile) 146 zoom::ZoomEventManager::GetForBrowserContext(profile)
145 ->AddZoomEventManagerObserver(this); 147 ->AddZoomEventManagerObserver(this);
146 148
147 [[field_ cell] setIsPopupMode: 149 [[field_ cell] setIsPopupMode:
148 !browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)]; 150 !browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)];
149 151
150 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 152 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
153 std::string security_chip;
151 if (command_line->HasSwitch(switches::kSecurityChip)) { 154 if (command_line->HasSwitch(switches::kSecurityChip)) {
152 std::string security_chip_flag = 155 security_chip = command_line->GetSwitchValueASCII(switches::kSecurityChip);
153 command_line->GetSwitchValueASCII(switches::kSecurityChip); 156 } else if (base::FeatureList::IsEnabled(features::kSecurityChip)) {
154 should_show_secure_verbose_ = 157 security_chip = variations::GetVariationParamValueByFeature(
155 security_chip_flag == switches::kSecurityChipShowAll; 158 features::kSecurityChip, kSecurityChipFeatureVisibilityParam);
156 should_show_nonsecure_verbose_ =
157 security_chip_flag == switches::kSecurityChipShowAll ||
158 security_chip_flag == switches::kSecurityChipShowNonSecureOnly;
159 } 159 }
160 160
161 if (security_chip == switches::kSecurityChipShowNonSecureOnly) {
162 should_show_nonsecure_verbose_ = true;
163 } else if (security_chip == switches::kSecurityChipShowAll) {
164 should_show_secure_verbose_ = true;
165 should_show_nonsecure_verbose_ = true;
166 }
167
168 std::string security_chip_animation;
161 if (command_line->HasSwitch(switches::kSecurityChipAnimation)) { 169 if (command_line->HasSwitch(switches::kSecurityChipAnimation)) {
162 std::string security_chip_animation_flag = 170 security_chip_animation =
163 command_line->GetSwitchValueASCII(switches::kSecurityChipAnimation); 171 command_line->GetSwitchValueASCII(switches::kSecurityChipAnimation);
164 should_animate_secure_verbose_ = 172 } else if (base::FeatureList::IsEnabled(features::kSecurityChip)) {
165 security_chip_animation_flag == switches::kSecurityChipAnimationAll; 173 security_chip_animation = variations::GetVariationParamValueByFeature(
174 features::kSecurityChip, kSecurityChipFeatureAnimationParam);
175 }
166 176
167 should_animate_nonsecure_verbose_ = 177 if (security_chip_animation ==
168 security_chip_animation_flag == 178 switches::kSecurityChipAnimationNonSecureOnly) {
169 switches::kSecurityChipAnimationNonSecureOnly || 179 should_animate_nonsecure_verbose_ = true;
170 security_chip_animation_flag == switches::kSecurityChipAnimationAll; 180 } else if (security_chip_animation == switches::kSecurityChipAnimationAll) {
181 should_animate_secure_verbose_ = true;
182 should_animate_nonsecure_verbose_ = true;
171 } 183 }
172 184
173 // Sets images for the decorations, and performs a layout. This call ensures 185 // Sets images for the decorations, and performs a layout. This call ensures
174 // that this class is in a consistent state after initialization. 186 // that this class is in a consistent state after initialization.
175 OnChanged(); 187 OnChanged();
176 } 188 }
177 189
178 LocationBarViewMac::~LocationBarViewMac() { 190 LocationBarViewMac::~LocationBarViewMac() {
179 // Disconnect from cell in case it outlives us. 191 // Disconnect from cell in case it outlives us.
180 [[field_ cell] clearDecorations]; 192 [[field_ cell] clearDecorations];
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 OnDecorationsChanged(); 965 OnDecorationsChanged();
954 } 966 }
955 967
956 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { 968 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() {
957 std::vector<LocationBarDecoration*> decorations = GetDecorations(); 969 std::vector<LocationBarDecoration*> decorations = GetDecorations();
958 std::vector<NSView*> views; 970 std::vector<NSView*> views;
959 for (auto* decoration : decorations) 971 for (auto* decoration : decorations)
960 views.push_back(decoration->GetAccessibilityView()); 972 views.push_back(decoration->GetAccessibilityView());
961 return views; 973 return views;
962 } 974 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/location_bar/location_bar.h » ('j') | testing/variations/fieldtrial_testing_config.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698