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

Side by Side Diff: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add some comments Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/content_settings/collected_cookies_mac.h" 5 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #import "base/mac/mac_util.h" 9 #import "base/mac/mac_util.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/tab_contents/tab_contents.h" 12 #include "chrome/browser/tab_contents/tab_contents.h"
13 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" 13 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h"
14 #include "chrome/common/notification_details.h" 14 #include "chrome/common/notification_details.h"
15 #include "chrome/common/notification_source.h" 15 #include "chrome/common/notification_source.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
18 #include "skia/ext/skia_utils_mac.h" 18 #include "skia/ext/skia_utils_mac.h"
19 #include "third_party/apple/ImageAndTextCell.h" 19 #include "third_party/apple/ImageAndTextCell.h"
20 #include "third_party/skia/include/core/SkBitmap.h" 20 #include "third_party/skia/include/core/SkBitmap.h"
21 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 21 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
22 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 22 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
23 #include "ui/base/l10n/l10n_util_mac.h" 23 #include "ui/base/l10n/l10n_util_mac.h"
24 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
25 #include "ui/gfx/image.h"
25 26
26 namespace { 27 namespace {
27 // Colors for the infobar. 28 // Colors for the infobar.
28 const double kBannerGradientColorTop[3] = 29 const double kBannerGradientColorTop[3] =
29 {255.0 / 255.0, 242.0 / 255.0, 183.0 / 255.0}; 30 {255.0 / 255.0, 242.0 / 255.0, 183.0 / 255.0};
30 const double kBannerGradientColorBottom[3] = 31 const double kBannerGradientColorBottom[3] =
31 {250.0 / 255.0, 230.0 / 255.0, 145.0 / 255.0}; 32 {250.0 / 255.0, 230.0 / 255.0, 145.0 / 255.0};
32 const double kBannerStrokeColor = 135.0 / 255.0; 33 const double kBannerStrokeColor = 135.0 / 255.0;
33 34
34 // Minimal height for the collected cookies dialog. 35 // Minimal height for the collected cookies dialog.
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 nil]]; 492 nil]];
492 [animation_ setViewAnimations:animations]; 493 [animation_ setViewAnimations:animations];
493 // The default duration is 0.5s, which actually feels slow in here, so speed 494 // The default duration is 0.5s, which actually feels slow in here, so speed
494 // it up a bit. 495 // it up a bit.
495 [animation_ gtm_setDuration:0.2 496 [animation_ gtm_setDuration:0.2
496 eventMask:NSLeftMouseUpMask]; 497 eventMask:NSLeftMouseUpMask];
497 [animation_ startAnimation]; 498 [animation_ startAnimation];
498 } 499 }
499 500
500 @end 501 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698