OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/content_setting_decoration.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
| 9 #include "base/prefs/pref_service.h" |
9 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
10 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
12 #include "chrome/browser/prefs/pref_service.h" | |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" | 14 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" |
15 #include "chrome/browser/ui/browser_list.h" | 15 #include "chrome/browser/ui/browser_list.h" |
16 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
" | 16 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
" |
17 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" | 17 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" |
18 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 18 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
19 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" | 19 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" |
20 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" | 20 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" |
21 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
22 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 } | 376 } |
377 | 377 |
378 void ContentSettingDecoration::AnimationTimerFired() { | 378 void ContentSettingDecoration::AnimationTimerFired() { |
379 owner_->Layout(); | 379 owner_->Layout(); |
380 // Even after the animation completes, the |animator_| object should be kept | 380 // Even after the animation completes, the |animator_| object should be kept |
381 // alive to prevent the animation from re-appearing if the page opens | 381 // alive to prevent the animation from re-appearing if the page opens |
382 // additional popups later. The animator will be cleared when the decoration | 382 // additional popups later. The animator will be cleared when the decoration |
383 // hides, indicating something has changed with the WebContents (probably | 383 // hides, indicating something has changed with the WebContents (probably |
384 // navigation). | 384 // navigation). |
385 } | 385 } |
OLD | NEW |