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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
OLDNEW
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"
10 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
11 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 11 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
13 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" 13 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
15 #include "chrome/browser/ui/browser_dialogs.h" 14 #include "chrome/browser/ui/browser_dialogs.h"
16 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
17 #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 "
18 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" 17 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
19 #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"
20 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 19 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
21 #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 "components/prefs/pref_service.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
24 #include "net/base/net_util.h" 24 #include "net/base/net_util.h"
25 #include "ui/base/cocoa/appkit_utils.h" 25 #include "ui/base/cocoa/appkit_utils.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/gfx/image/image.h" 27 #include "ui/gfx/image/image.h"
28 #include "ui/gfx/mac/coordinate_conversion.h" 28 #include "ui/gfx/mac/coordinate_conversion.h"
29 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 29 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
30 30
31 using content::WebContents; 31 using content::WebContents;
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 } 359 }
360 360
361 void ContentSettingDecoration::AnimationTimerFired() { 361 void ContentSettingDecoration::AnimationTimerFired() {
362 owner_->Layout(); 362 owner_->Layout();
363 // Even after the animation completes, the |animator_| object should be kept 363 // Even after the animation completes, the |animator_| object should be kept
364 // alive to prevent the animation from re-appearing if the page opens 364 // alive to prevent the animation from re-appearing if the page opens
365 // additional popups later. The animator will be cleared when the decoration 365 // additional popups later. The animator will be cleared when the decoration
366 // hides, indicating something has changed with the WebContents (probably 366 // hides, indicating something has changed with the WebContents (probably
367 // navigation). 367 // navigation).
368 } 368 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/keystone_infobar_delegate.mm ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698