| 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" | |
| 11 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| 11 #include "base/threading/thread_task_runner_handle.h" |
| 12 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
| 13 #include "chrome/browser/content_settings/cookie_settings_factory.h" | 13 #include "chrome/browser/content_settings/cookie_settings_factory.h" |
| 14 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 14 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| 15 #include "chrome/browser/infobars/infobar_service.h" | 15 #include "chrome/browser/infobars/infobar_service.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh
eet.h" | 17 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh
eet.h" |
| 18 #import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller
.h" | 18 #import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller
.h" |
| 19 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" | 19 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" |
| 20 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h" | 20 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h" |
| 21 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type); | 78 DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type); |
| 79 window_->CloseWebContentsModalDialog(); | 79 window_->CloseWebContentsModalDialog(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 void CollectedCookiesMac::PerformClose() { | 82 void CollectedCookiesMac::PerformClose() { |
| 83 window_->CloseWebContentsModalDialog(); | 83 window_->CloseWebContentsModalDialog(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void CollectedCookiesMac::OnConstrainedWindowClosed( | 86 void CollectedCookiesMac::OnConstrainedWindowClosed( |
| 87 ConstrainedWindowMac* window) { | 87 ConstrainedWindowMac* window) { |
| 88 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); | 88 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); |
| 89 } | 89 } |
| 90 | 90 |
| 91 #pragma mark Window Controller | 91 #pragma mark Window Controller |
| 92 | 92 |
| 93 @interface CollectedCookiesWindowController (Private) | 93 @interface CollectedCookiesWindowController (Private) |
| 94 - (void)showInfoBarForDomain:(const base::string16&)domain | 94 - (void)showInfoBarForDomain:(const base::string16&)domain |
| 95 setting:(ContentSetting)setting; | 95 setting:(ContentSetting)setting; |
| 96 - (void)showInfoBarForMultipleDomainsAndSetting:(ContentSetting)setting; | 96 - (void)showInfoBarForMultipleDomainsAndSetting:(ContentSetting)setting; |
| 97 - (void)animateInfoBar; | 97 - (void)animateInfoBar; |
| 98 @end | 98 @end |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 treeController = blockedTreeController_; | 506 treeController = blockedTreeController_; |
| 507 break; | 507 break; |
| 508 default: | 508 default: |
| 509 NOTREACHED(); | 509 NOTREACHED(); |
| 510 return; | 510 return; |
| 511 } | 511 } |
| 512 [detailsViewController_ configureBindingsForTreeController:treeController]; | 512 [detailsViewController_ configureBindingsForTreeController:treeController]; |
| 513 } | 513 } |
| 514 | 514 |
| 515 @end | 515 @end |
| OLD | NEW |