diff options
| author | georgey@chromium.org <georgey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 00:36:59 +0000 |
|---|---|---|
| committer | georgey@chromium.org <georgey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 00:36:59 +0000 |
| commit | efe3ddc3dde5349e50a96bd445a0d6569215a139 (patch) | |
| tree | 156a7fc4a72e8a1d7ff087eed99652d3f0c2eb09 /chrome/browser/cocoa | |
| parent | 7c7b711b565a4a8ec54ad1df76d1945dd451e2cd (diff) | |
| download | chromium_src-efe3ddc3dde5349e50a96bd445a0d6569215a139.zip chromium_src-efe3ddc3dde5349e50a96bd445a0d6569215a139.tar.gz chromium_src-efe3ddc3dde5349e50a96bd445a0d6569215a139.tar.bz2 | |
Fix for "New blocked popup UI" on Windows
Changes:
1. new sets of strings indicating animation in chrome/browser/content_setting_image_model.cc - non-NULL id indicated that the situation is animated.
2. TabSpecificContentSettings has indicator that the new blockage occured, and was/was not messaged to the user.
3. ContentSettingImageView on Windows/ChromeOs is descended from LinearAnimation to allow animation of the popup indicator to the user.
BUG=39260
TEST=Mocks
Review URL: http://codereview.chromium.org/3120034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/cocoa/location_bar/content_setting_decoration.h index d54db31..7e8904b5 100644 --- a/chrome/browser/cocoa/location_bar/content_setting_decoration.h +++ b/chrome/browser/cocoa/location_bar/content_setting_decoration.h @@ -27,7 +27,7 @@ class ContentSettingDecoration : public ImageDecoration { // Updates the image and visibility state based on the supplied TabContents. // Returns true if the decoration's visible state changed. - bool UpdateFromTabContents(const TabContents* tab_contents); + bool UpdateFromTabContents(TabContents* tab_contents); // Overridden from |LocationBarDecoration| virtual bool AcceptsMousePress() { return true; } diff --git a/chrome/browser/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/cocoa/location_bar/content_setting_decoration.mm index cfce460..358669f 100644 --- a/chrome/browser/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/cocoa/location_bar/content_setting_decoration.mm @@ -41,7 +41,7 @@ ContentSettingDecoration::~ContentSettingDecoration() { } bool ContentSettingDecoration::UpdateFromTabContents( - const TabContents* tab_contents) { + TabContents* tab_contents) { bool was_visible = IsVisible(); int old_icon = content_setting_image_model_->get_icon(); content_setting_image_model_->UpdateFromTabContents(tab_contents); diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm index 2f106ab..8c424ac 100644 --- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm @@ -559,7 +559,7 @@ void LocationBarViewMac::PostNotification(NSString* notification) { bool LocationBarViewMac::RefreshContentSettingsDecorations() { const bool input_in_progress = toolbar_model_->input_in_progress(); - const TabContents* tab_contents = + TabContents* tab_contents = input_in_progress ? NULL : browser_->GetSelectedTabContents(); bool icons_updated = false; for (size_t i = 0; i < content_setting_decorations_.size(); ++i) { |