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

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

Issue 1446623003: [Reland] Enable AutoResize for Constrained Web Dialogs for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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
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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/mac/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/browsing_data/cookies_tree_model.h" 10 #include "chrome/browser/browsing_data/cookies_tree_model.h"
(...skipping 29 matching lines...) Expand all
40 } 40 }
41 41
42 private: 42 private:
43 // NotificationObserver implementation. 43 // NotificationObserver implementation.
44 void Observe(int type, 44 void Observe(int type,
45 const content::NotificationSource& source, 45 const content::NotificationSource& source,
46 const content::NotificationDetails& details) override; 46 const content::NotificationDetails& details) override;
47 47
48 content::NotificationRegistrar registrar_; 48 content::NotificationRegistrar registrar_;
49 49
50 scoped_ptr<ConstrainedWindowMac> window_; 50 std::unique_ptr<ConstrainedWindowMac> window_;
51 51
52 base::scoped_nsobject<CollectedCookiesWindowController> sheet_controller_; 52 base::scoped_nsobject<CollectedCookiesWindowController> sheet_controller_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(CollectedCookiesMac); 54 DISALLOW_COPY_AND_ASSIGN(CollectedCookiesMac);
55 }; 55 };
56 56
57 // Controller for the collected cookies dialog. This class stores an internal 57 // Controller for the collected cookies dialog. This class stores an internal
58 // copy of the CookiesTreeModel but with Cocoa-converted values (NSStrings and 58 // copy of the CookiesTreeModel but with Cocoa-converted values (NSStrings and
59 // NSImages instead of std::strings and ImageSkias). Doing this allows us to use 59 // NSImages instead of std::strings and ImageSkias). Doing this allows us to use
60 // bindings for the interface. Changes are pushed to this internal model via a 60 // bindings for the interface. Changes are pushed to this internal model via a
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 - (CookiesTreeModel*)allowedTreeModel; 142 - (CookiesTreeModel*)allowedTreeModel;
143 - (CookiesTreeModel*)blockedTreeModel; 143 - (CookiesTreeModel*)blockedTreeModel;
144 144
145 - (void)loadTreeModelFromWebContents; 145 - (void)loadTreeModelFromWebContents;
146 146
147 // Given an array of selected NSTreeNode objects, normalizes the selection so 147 // Given an array of selected NSTreeNode objects, normalizes the selection so
148 // that it does not contain any children whose parents are also in the array. 148 // that it does not contain any children whose parents are also in the array.
149 + (NSArray*)normalizeNodeSelection:(NSArray*)selection; 149 + (NSArray*)normalizeNodeSelection:(NSArray*)selection;
150 150
151 @end 151 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698