Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 BLIMP_ENGINE_APP_BLIMP_CONTENT_MAIN_DELEGATE_H_ | 5 #ifndef BLIMP_ENGINE_APP_BLIMP_CONTENT_MAIN_DELEGATE_H_ |
| 6 #define BLIMP_ENGINE_APP_BLIMP_CONTENT_MAIN_DELEGATE_H_ | 6 #define BLIMP_ENGINE_APP_BLIMP_CONTENT_MAIN_DELEGATE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 ~BlimpContentMainDelegate() override; | 23 ~BlimpContentMainDelegate() override; |
| 24 | 24 |
| 25 BlimpContentBrowserClient* browser_client() { return browser_client_.get(); } | 25 BlimpContentBrowserClient* browser_client() { return browser_client_.get(); } |
| 26 | 26 |
| 27 // content::ContentMainDelegate implementation. | 27 // content::ContentMainDelegate implementation. |
| 28 bool BasicStartupComplete(int* exit_code) override; | 28 bool BasicStartupComplete(int* exit_code) override; |
| 29 void PreSandboxStartup() override; | 29 void PreSandboxStartup() override; |
| 30 content::ContentBrowserClient* CreateContentBrowserClient() override; | 30 content::ContentBrowserClient* CreateContentBrowserClient() override; |
| 31 content::ContentRendererClient* CreateContentRendererClient() override; | 31 content::ContentRendererClient* CreateContentRendererClient() override; |
| 32 | 32 |
| 33 void SetContentBrowserClientForTesting( | |
| 34 std::unique_ptr<BlimpContentBrowserClient> browser_client_ptr); | |
| 35 | |
| 33 private: | 36 private: |
| 34 void InitializeResourceBundle(); | 37 void InitializeResourceBundle(); |
| 35 | 38 |
| 36 std::unique_ptr<BlimpContentBrowserClient> browser_client_; | 39 std::unique_ptr<BlimpContentBrowserClient> browser_client_; |
| 37 std::unique_ptr<BlimpContentRendererClient> renderer_client_; | 40 std::unique_ptr<BlimpContentRendererClient> renderer_client_; |
| 38 BlimpContentClient content_client_; | 41 BlimpContentClient content_client_; |
| 39 | 42 |
| 40 DISALLOW_COPY_AND_ASSIGN(BlimpContentMainDelegate); | 43 // DISALLOW_COPY_AND_ASSIGN(BlimpContentMainDelegate); |
|
jbudorick at gmail
2017/01/06 16:09:36
Same.
shenghuazhang
2017/01/07 01:21:24
Forgot to uncomment it back after debugging :P
Don
| |
| 41 }; | 44 }; |
| 42 | 45 |
| 43 } // namespace engine | 46 } // namespace engine |
| 44 } // namespace blimp | 47 } // namespace blimp |
| 45 | 48 |
| 46 #endif // BLIMP_ENGINE_APP_BLIMP_CONTENT_MAIN_DELEGATE_H_ | 49 #endif // BLIMP_ENGINE_APP_BLIMP_CONTENT_MAIN_DELEGATE_H_ |
| OLD | NEW |