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

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

Issue 2911773002: Clean up unused grit header includes in chrome/ (Closed)
Patch Set: rebase Created 3 years, 6 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/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 11 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" 13 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
14 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
15 #include "chrome/browser/ui/cocoa/browser_dialogs_views_mac.h" 15 #include "chrome/browser/ui/cocoa/browser_dialogs_views_mac.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 #import "chrome/browser/ui/cocoa/l10n_util.h" 17 #import "chrome/browser/ui/cocoa/l10n_util.h"
18 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" 18 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
19 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 19 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
20 #import "chrome/browser/ui/cocoa/themed_window.h" 20 #import "chrome/browser/ui/cocoa/themed_window.h"
21 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 21 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
22 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 22 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
23 #include "chrome/grit/theme_resources.h"
24 #include "components/prefs/pref_service.h" 23 #include "components/prefs/pref_service.h"
25 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
26 #include "skia/ext/skia_utils_mac.h" 25 #include "skia/ext/skia_utils_mac.h"
27 #include "ui/base/cocoa/appkit_utils.h" 26 #include "ui/base/cocoa/appkit_utils.h"
28 #include "ui/base/cocoa/cocoa_base_utils.h" 27 #include "ui/base/cocoa/cocoa_base_utils.h"
29 #import "ui/base/cocoa/nsview_additions.h" 28 #import "ui/base/cocoa/nsview_additions.h"
30 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/base/material_design/material_design_controller.h" 30 #include "ui/base/material_design/material_design_controller.h"
32 #include "ui/gfx/color_palette.h" 31 #include "ui/gfx/color_palette.h"
33 #include "ui/gfx/image/image.h" 32 #include "ui/gfx/image/image.h"
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 } 437 }
439 438
440 void ContentSettingDecoration::AnimationTimerFired() { 439 void ContentSettingDecoration::AnimationTimerFired() {
441 owner_->Layout(); 440 owner_->Layout();
442 // Even after the animation completes, the |animator_| object should be kept 441 // Even after the animation completes, the |animator_| object should be kept
443 // alive to prevent the animation from re-appearing if the page opens 442 // alive to prevent the animation from re-appearing if the page opens
444 // additional popups later. The animator will be cleared when the decoration 443 // additional popups later. The animator will be cleared when the decoration
445 // hides, indicating something has changed with the WebContents (probably 444 // hides, indicating something has changed with the WebContents (probably
446 // navigation). 445 // navigation).
447 } 446 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698