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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Undo Screen TLS change, don't use Screen::GetScreen() in Mus. Created 3 years, 5 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 #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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 } 46 }
47 47
48 namespace user_prefs { 48 namespace user_prefs {
49 class PrefRegistrySyncable; 49 class PrefRegistrySyncable;
50 } 50 }
51 51
52 namespace version_info { 52 namespace version_info {
53 enum class Channel; 53 enum class Channel;
54 } 54 }
55 55
56 #if defined(OS_CHROMEOS)
57 namespace ui {
58 class ImageCursors;
59 }
60 #endif // defined(OS_CHROMEOS)
61
56 namespace url { 62 namespace url {
57 class Origin; 63 class Origin;
58 } 64 }
59 65
60 class ChromeContentBrowserClient : public content::ContentBrowserClient { 66 class ChromeContentBrowserClient : public content::ContentBrowserClient {
61 public: 67 public:
62 ChromeContentBrowserClient(); 68 ChromeContentBrowserClient();
63 ~ChromeContentBrowserClient() override; 69 ~ChromeContentBrowserClient() override;
64 70
65 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 71 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 396
391 service_manager::BinderRegistry gpu_binder_registry_; 397 service_manager::BinderRegistry gpu_binder_registry_;
392 398
393 scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service_; 399 scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service_;
394 400
395 std::unique_ptr<service_manager::BinderRegistry> frame_interfaces_; 401 std::unique_ptr<service_manager::BinderRegistry> frame_interfaces_;
396 std::unique_ptr< 402 std::unique_ptr<
397 service_manager::BinderRegistryWithParams<content::RenderFrameHost*>> 403 service_manager::BinderRegistryWithParams<content::RenderFrameHost*>>
398 frame_interfaces_parameterized_; 404 frame_interfaces_parameterized_;
399 405
406 #if defined(OS_CHROMEOS)
407 // Created for the UI Service.
408 std::unique_ptr<ui::ImageCursors> image_cursors_;
409 #endif // defined(OS_CHROMEOS)
410
400 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 411 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
401 412
402 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 413 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
403 }; 414 };
404 415
405 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 416 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698