chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm - Issue 6028015: Make the popup blocker on by default. Flip the flag to be a disabling one.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

Issue 6028015: Make the popup blocker on by default. Flip the flag to be a disabling one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 11 months 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

index 523eb6fa82d8dc3dfcd419ed87f30305686a8e30..48abf2ef3c69ff337e1cae975267233a7ac750a2 100644

--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

@@ -188,8 +188,8 @@ bool ContentSettingDecoration::UpdateFromTabContents(

bool has_animated_text =

content_setting_image_model_->explanatory_string_id();

// Check if the animation is enabled.

- bool animation_enabled = CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableBlockContentAnimation);

+ bool animation_enabled = !CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kDisableBlockContentAnimation);

if (has_animated_text && animation_enabled && !animation_) {

// Start animation, its timer will drive reflow. Note the text is

// cached so it is not allowed to change during the animation.

« no previous file with comments | « no previous file | chrome/browser/ui/views/location_bar/content_setting_image_view.cc » ('j') | no next file with comments »