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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
349 // for prerendering and an override cookie store must be provided. | 349 // for prerendering and an override cookie store must be provided. |
350 // This needs to be kept as a member rather than just looked up from | 350 // This needs to be kept as a member rather than just looked up from |
351 // the profile due to initialization ordering, as well as due to threading. | 351 // the profile due to initialization ordering, as well as due to threading. |
352 // It is initialized on the UI thread when the ResoureDispatcherHost is | 352 // It is initialized on the UI thread when the ResoureDispatcherHost is |
353 // created. It is used only the IO thread. | 353 // created. It is used only the IO thread. |
354 prerender::PrerenderTracker* prerender_tracker_; | 354 prerender::PrerenderTracker* prerender_tracker_; |
355 | 355 |
356 // TODO(peter) remove once NotificationPermissionRequested is removed. | 356 // TODO(peter) remove once NotificationPermissionRequested is removed. |
357 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 357 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
358 | 358 |
359 friend class DisableWebRtcEncryptionFlagTest; | |
Ryan Sleevi
2014/07/31 00:31:28
Just like in life, put your friends first.
In par
jww
2014/07/31 05:57:00
Whoops, that was actually due to a bad rebase (thi
| |
360 | |
359 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 361 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
360 }; | 362 }; |
361 | 363 |
362 } // namespace chrome | 364 } // namespace chrome |
363 | 365 |
364 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 366 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |