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

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

Issue 2218843003: mustash chrome: Change how mus connection is set up in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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
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 23 matching lines...) Expand all
34 } 34 }
35 35
36 namespace user_prefs { 36 namespace user_prefs {
37 class PrefRegistrySyncable; 37 class PrefRegistrySyncable;
38 } 38 }
39 39
40 namespace version_info { 40 namespace version_info {
41 enum class Channel; 41 enum class Channel;
42 } 42 }
43 43
44 namespace views {
45 class WindowManagerConnection;
46 }
47
44 class ChromeContentBrowserClient : public content::ContentBrowserClient { 48 class ChromeContentBrowserClient : public content::ContentBrowserClient {
45 public: 49 public:
46 ChromeContentBrowserClient(); 50 ChromeContentBrowserClient();
47 ~ChromeContentBrowserClient() override; 51 ~ChromeContentBrowserClient() override;
48 52
49 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 53 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
50 54
51 // Notification that the application locale has changed. This allows us to 55 // Notification that the application locale has changed. This allows us to
52 // update our I/O thread cache of this value. 56 // update our I/O thread cache of this value.
53 static void SetApplicationLocale(const std::string& locale); 57 static void SetApplicationLocale(const std::string& locale);
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 #if defined(ENABLE_PLUGINS) 338 #if defined(ENABLE_PLUGINS)
335 // Set of origins that can use TCP/UDP private APIs from NaCl. 339 // Set of origins that can use TCP/UDP private APIs from NaCl.
336 std::set<std::string> allowed_socket_origins_; 340 std::set<std::string> allowed_socket_origins_;
337 // Set of origins that can get a handle for FileIO from NaCl. 341 // Set of origins that can get a handle for FileIO from NaCl.
338 std::set<std::string> allowed_file_handle_origins_; 342 std::set<std::string> allowed_file_handle_origins_;
339 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable 343 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
340 // versions of Chrome. 344 // versions of Chrome.
341 std::set<std::string> allowed_dev_channel_origins_; 345 std::set<std::string> allowed_dev_channel_origins_;
342 #endif 346 #endif
343 347
348 #if defined(USE_AURA)
349 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
350 #endif
351
344 // Vector of additional ChromeContentBrowserClientParts. 352 // Vector of additional ChromeContentBrowserClientParts.
345 // Parts are deleted in the reverse order they are added. 353 // Parts are deleted in the reverse order they are added.
346 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 354 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
347 355
348 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 356 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
349 357
350 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 358 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
351 }; 359 };
352 360
353 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 361 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/chrome_content_browser_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698