blimp/client/core/blimp_client_context_impl.h - Issue 2191743002: Setup the delegate in Chrome, so we may put chrome java functions we need in blimp to the delegate …

Side by Side Diff: blimp/client/core/blimp_client_context_impl.h

Issue 2191743002: Setup the delegate in Chrome, so we may put chrome java functions we need in blimp to the delegate … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resovle merge conflicts. 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

« blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java ('K') | « blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java ('k') | blimp/client/core/blimp_client_context_impl.cc » ('j') | blimp/client/public/android/java/src/org/chromium/blimp_public/BlimpClientContextDelegate.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_	5 #ifndef BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_

6 #define BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_	6 #define BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/supports_user_data.h"	9 #include "base/supports_user_data.h"

10 #include "blimp/client/public/blimp_client_context.h"	10 #include "blimp/client/public/blimp_client_context.h"

(...skipping 20 matching lines...) Expand all Loading...
31	31

32 #if defined(OS_ANDROID)	32 #if defined(OS_ANDROID)

33 BlimpClientContextImplAndroid* GetBlimpClientContextImplAndroid();	33 BlimpClientContextImplAndroid* GetBlimpClientContextImplAndroid();

34 #endif // defined(OS_ANDROID)	34 #endif // defined(OS_ANDROID)

35	35

36 // BlimpClientContext implementation.	36 // BlimpClientContext implementation.

37 #if defined(OS_ANDROID)	37 #if defined(OS_ANDROID)

38 base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;	38 base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;

39 #endif // defined(OS_ANDROID)	39 #endif // defined(OS_ANDROID)

40 void SetDelegate(BlimpClientContextDelegate* delegate) override;	40 void SetDelegate(BlimpClientContextDelegate* delegate) override;

	41 BlimpClientContextDelegate* GetDelegate();
	nyquist 2016/07/28 19:15:34 This is not part of the BlimpClientContext impleme This is not part of the BlimpClientContext implementation, so it should be moved out separately, and a comment added. xingliu 2016/07/28 22:43:09 Done. Show quoted text On 2016/07/28 19:15:34, nyquist wrote: > This is not part of the BlimpClientContext implementation, so it should be moved > out separately, and a comment added. Done.
41 std::unique_ptr<BlimpContents> CreateBlimpContents() override;	42 std::unique_ptr<BlimpContents> CreateBlimpContents() override;

42	43

43 private:	44 private:

44 BlimpClientContextDelegate* delegate_;	45 BlimpClientContextDelegate* delegate_;

45	46

46 DISALLOW_COPY_AND_ASSIGN(BlimpClientContextImpl);	47 DISALLOW_COPY_AND_ASSIGN(BlimpClientContextImpl);

47 };	48 };

48	49

49 } // namespace client	50 } // namespace client

50 } // namespace blimp	51 } // namespace blimp

51	52

52 #endif // BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_	53 #endif // BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_

OLD	NEW