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

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

Issue 1570943002: [Blimp client] Move client code into blimp::client namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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_CLIENT_ANDROID_TOOLBAR_H_ 5 #ifndef BLIMP_CLIENT_ANDROID_TOOLBAR_H_
6 #define BLIMP_CLIENT_ANDROID_TOOLBAR_H_ 6 #define BLIMP_CLIENT_ANDROID_TOOLBAR_H_
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "blimp/client/session/navigation_feature.h" 10 #include "blimp/client/session/navigation_feature.h"
11 11
12 class GURL; 12 class GURL;
13 class SkBitmap; 13 class SkBitmap;
14 14
15 namespace blimp { 15 namespace blimp {
16 namespace client {
16 17
17 // The native component of org.chromium.blimp.toolbar.Toolbar. This handles 18 // The native component of org.chromium.blimp.toolbar.Toolbar. This handles
18 // marshalling calls between Java and native. Specifically, this passes calls 19 // marshalling calls between Java and native. Specifically, this passes calls
19 // between Toolbar.java <=> NavigationFeature. 20 // between Toolbar.java <=> NavigationFeature.
20 class Toolbar : public NavigationFeature::NavigationFeatureDelegate { 21 class Toolbar : public NavigationFeature::NavigationFeatureDelegate {
21 public: 22 public:
22 static bool RegisterJni(JNIEnv* env); 23 static bool RegisterJni(JNIEnv* env);
23 24
24 Toolbar(JNIEnv* env, 25 Toolbar(JNIEnv* env,
25 const base::android::JavaParamRef<jobject>& jobj, 26 const base::android::JavaParamRef<jobject>& jobj,
(...skipping 24 matching lines...) Expand all
50 // outgoing and incoming navigation messages from the engine. Toolbar does not 51 // outgoing and incoming navigation messages from the engine. Toolbar does not
51 // own this and it is expected to outlive this Toolbar instance. 52 // own this and it is expected to outlive this Toolbar instance.
52 NavigationFeature* navigation_feature_; 53 NavigationFeature* navigation_feature_;
53 54
54 // Reference to the Java object which owns this class. 55 // Reference to the Java object which owns this class.
55 base::android::ScopedJavaGlobalRef<jobject> java_obj_; 56 base::android::ScopedJavaGlobalRef<jobject> java_obj_;
56 57
57 DISALLOW_COPY_AND_ASSIGN(Toolbar); 58 DISALLOW_COPY_AND_ASSIGN(Toolbar);
58 }; 59 };
59 60
61 } // namespace client
60 } // namespace blimp 62 } // namespace blimp
61 63
62 #endif // BLIMP_CLIENT_ANDROID_TOOLBAR_H_ 64 #endif // BLIMP_CLIENT_ANDROID_TOOLBAR_H_
OLDNEW
« no previous file with comments | « blimp/client/android/java/src/org/chromium/blimp/toolbar/Toolbar.java ('k') | blimp/client/android/toolbar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698