chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nit Created 6 years, 4 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

« chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc ('K') | « chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('J')
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 #include "base/message_loop/message_loop.h"	10 #include "base/message_loop/message_loop.h"

11 #include "base/prefs/pref_service.h"	11 #include "base/prefs/pref_service.h"

12 #include "base/strings/sys_string_conversions.h"	12 #include "base/strings/sys_string_conversions.h"

13 #include "chrome/browser/chrome_notification_types.h"	13 #include "chrome/browser/chrome_notification_types.h"

14 #include "chrome/browser/content_settings/cookie_settings.h"	14 #include "chrome/browser/content_settings/cookie_settings.h"

15 #include "chrome/browser/content_settings/local_shared_objects_container.h"	15 #include "chrome/browser/content_settings/local_shared_objects_container.h"

16 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	16 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

17 #include "chrome/browser/infobars/infobar_service.h"	17 #include "chrome/browser/infobars/infobar_service.h"

18 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/ui/browser_dialogs.h"	19 #include "chrome/browser/ui/browser_dialogs.h"

20 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h"	20 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h"

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

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

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

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

	25 #include "chrome/grit/generated_resources.h"

25 #include "content/public/browser/notification_details.h"	26 #include "content/public/browser/notification_details.h"

26 #include "content/public/browser/notification_source.h"	27 #include "content/public/browser/notification_source.h"

27 #include "content/public/browser/web_contents.h"	28 #include "content/public/browser/web_contents.h"

28 #include "grit/generated_resources.h"

29 #include "grit/theme_resources.h"	29 #include "grit/theme_resources.h"

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

31 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h "	31 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h "

32 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"	32 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"

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

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

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

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

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

38	38

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

517 break;	517 break;

518 default:	518 default:

519 NOTREACHED();	519 NOTREACHED();

520 return;	520 return;

521 }	521 }

522 [detailsViewController_ configureBindingsForTreeController:treeController];	522 [detailsViewController_ configureBindingsForTreeController:treeController];

523 }	523 }

524	524

525 @end	525 @end

OLD	NEW