blimp/client/app/android/toolbar.h - Issue 2058263002: Tied up BlimpNavigationController to NavigationFeature

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: blimp/client/app/android/toolbar.h

Issue 2058263002: Tied up BlimpNavigationController to NavigationFeature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blimp_core

Patch Set: Removed BlimpContentsTest.java 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

« no previous file with comments | « blimp/client/app/android/javatests/src/org/chromium/blimp/core/contents/BlimpContentsTest.java ('k') | blimp/client/app/linux/blimp_client_session_linux.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_CLIENT_APP_ANDROID_TOOLBAR_H_	5 #ifndef BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_

6 #define BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_	6 #define BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/android/jni_android.h"	10 #include "base/android/jni_android.h"

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

12 #include "blimp/client/feature/navigation_feature.h"	12 #include "blimp/client/core/contents/navigation_feature.h"

13	13

14 class GURL;	14 class GURL;

15 class SkBitmap;	15 class SkBitmap;

16	16

17 namespace blimp {	17 namespace blimp {

18 namespace client {	18 namespace client {

19	19

20 // The native component of org.chromium.blimp.toolbar.Toolbar. This handles	20 // The native component of org.chromium.blimp.toolbar.Toolbar. This handles

21 // marshalling calls between Java and native. Specifically, this passes calls	21 // marshalling calls between Java and native. Specifically, this passes calls

22 // between Toolbar.java <=> NavigationFeature.	22 // between Toolbar.java <=> NavigationFeature.

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 // Reference to the Java object which owns this class.	58 // Reference to the Java object which owns this class.

59 base::android::ScopedJavaGlobalRef<jobject> java_obj_;	59 base::android::ScopedJavaGlobalRef<jobject> java_obj_;

60	60

61 DISALLOW_COPY_AND_ASSIGN(Toolbar);	61 DISALLOW_COPY_AND_ASSIGN(Toolbar);

62 };	62 };

63	63

64 } // namespace client	64 } // namespace client

65 } // namespace blimp	65 } // namespace blimp

66	66

67 #endif // BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_	67 #endif // BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_

OLD	NEW