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

Side by Side Diff: blimp/engine/app/blimp_content_main_delegate.h

Issue 1929723002: [Blimp] Adds blimp engine browser test framework and LoadUrl test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addresses mmenke's comments. Client uses assignment directly without reading commandline. Created 4 years, 7 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 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"
11 #include "blimp/engine/common/blimp_content_client.h" 11 #include "blimp/engine/common/blimp_content_client.h"
12 #include "content/public/app/content_main_delegate.h" 12 #include "content/public/app/content_main_delegate.h"
13 13
14 namespace blimp { 14 namespace blimp {
15 namespace engine { 15 namespace engine {
16 16
17 class BlimpContentBrowserClient; 17 class BlimpContentBrowserClient;
18 class BlimpContentRendererClient; 18 class BlimpContentRendererClient;
19 19
20 class BlimpContentMainDelegate : public content::ContentMainDelegate { 20 class BlimpContentMainDelegate : public content::ContentMainDelegate {
21 public: 21 public:
22 BlimpContentMainDelegate(); 22 BlimpContentMainDelegate();
23 ~BlimpContentMainDelegate() override; 23 ~BlimpContentMainDelegate() override;
24 24
25 BlimpContentBrowserClient* GetBlimpContentBrowserClient();
Kevin M 2016/05/05 20:28:51 This is a simple getter, so how about "browser_cli
haibinlu 2016/05/05 22:41:36 Done.
26
25 // content::ContentMainDelegate implementation. 27 // content::ContentMainDelegate implementation.
26 bool BasicStartupComplete(int* exit_code) override; 28 bool BasicStartupComplete(int* exit_code) override;
27 void PreSandboxStartup() override; 29 void PreSandboxStartup() override;
28 content::ContentBrowserClient* CreateContentBrowserClient() override; 30 content::ContentBrowserClient* CreateContentBrowserClient() override;
29 content::ContentRendererClient* CreateContentRendererClient() override; 31 content::ContentRendererClient* CreateContentRendererClient() override;
30 32
33 static BlimpContentMainDelegate* GetInstanceForTesting();
34
31 private: 35 private:
32 void InitializeResourceBundle(); 36 void InitializeResourceBundle();
33 37
34 std::unique_ptr<BlimpContentBrowserClient> browser_client_; 38 std::unique_ptr<BlimpContentBrowserClient> browser_client_;
35 std::unique_ptr<BlimpContentRendererClient> renderer_client_; 39 std::unique_ptr<BlimpContentRendererClient> renderer_client_;
36 BlimpContentClient content_client_; 40 BlimpContentClient content_client_;
37 41
38 DISALLOW_COPY_AND_ASSIGN(BlimpContentMainDelegate); 42 DISALLOW_COPY_AND_ASSIGN(BlimpContentMainDelegate);
39 }; 43 };
40 44
41 } // namespace engine 45 } // namespace engine
42 } // namespace blimp 46 } // namespace blimp
43 47
44 #endif // BLIMP_ENGINE_APP_BLIMP_CONTENT_MAIN_DELEGATE_H_ 48 #endif // BLIMP_ENGINE_APP_BLIMP_CONTENT_MAIN_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698