chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm - Issue 10656014: Merge 143605 - grd file update for new 2x assets

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

Issue 10656014: Merge 143605 - grd file update for new 2x assets (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/

Patch Set: Created 8 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/download/download_item_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/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 #include "base/mac/bundle_locations.h"	9 #include "base/mac/bundle_locations.h"

10 #import "base/mac/mac_util.h"	10 #import "base/mac/mac_util.h"

(...skipping 15 matching lines...) Expand all Loading...
26 #include "chrome/browser/ui/cocoa/constrained_window_mac.h"	26 #include "chrome/browser/ui/cocoa/constrained_window_mac.h"

27 #import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller .h"	27 #import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller .h"

28 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h"	28 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h"

29 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"	29 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"

30 #include "chrome/browser/ui/tab_contents/tab_contents.h"	30 #include "chrome/browser/ui/tab_contents/tab_contents.h"

31 #include "chrome/common/chrome_notification_types.h"	31 #include "chrome/common/chrome_notification_types.h"

32 #include "chrome/common/pref_names.h"	32 #include "chrome/common/pref_names.h"

33 #include "content/public/browser/notification_details.h"	33 #include "content/public/browser/notification_details.h"

34 #include "content/public/browser/notification_source.h"	34 #include "content/public/browser/notification_source.h"

35 #include "grit/generated_resources.h"	35 #include "grit/generated_resources.h"

36 #include "grit/theme_resources.h"	36 #include "grit/theme_resources_standard.h"

37 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"	37 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"

38 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"	38 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"

39 #include "third_party/apple_sample_code/ImageAndTextCell.h"	39 #include "third_party/apple_sample_code/ImageAndTextCell.h"

40 #include "ui/base/l10n/l10n_util_mac.h"	40 #include "ui/base/l10n/l10n_util_mac.h"

41 #include "ui/base/resource/resource_bundle.h"	41 #include "ui/base/resource/resource_bundle.h"

42 #include "ui/gfx/image/image.h"	42 #include "ui/gfx/image/image.h"

43 #include "ui/gfx/image/image_skia.h"	43 #include "ui/gfx/image/image_skia.h"

44 #include "ui/gfx/image/image_skia_util_mac.h"	44 #include "ui/gfx/image/image_skia_util_mac.h"

45	45

46 namespace {	46 namespace {

(...skipping 508 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
555 treeController = blockedTreeController_;	555 treeController = blockedTreeController_;

556 break;	556 break;

557 default:	557 default:

558 NOTREACHED();	558 NOTREACHED();

559 return;	559 return;

560 }	560 }

561 [detailsViewController_ configureBindingsForTreeController:treeController];	561 [detailsViewController_ configureBindingsForTreeController:treeController];

562 }	562 }

563	563

564 @end	564 @end

OLD	NEW