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

Side by Side Diff: chrome/browser/ui/android/toolbar/toolbar_model_android.h

Issue 247263009: Rename jni_helper.h to jni_weak_ref.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_
6 #define CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_ 6 #define CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_helper.h" 9 #include "base/android/jni_weak_ref.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/browser/ui/toolbar/toolbar_model.h" 13 #include "chrome/browser/ui/toolbar/toolbar_model.h"
14 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" 14 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
15 15
16 namespace content { 16 namespace content {
17 class WebContents; 17 class WebContents;
18 } // content 18 } // content
19 19
(...skipping 21 matching lines...) Expand all
41 static bool RegisterToolbarModelAndroid(JNIEnv* env); 41 static bool RegisterToolbarModelAndroid(JNIEnv* env);
42 42
43 private: 43 private:
44 scoped_ptr<ToolbarModel> toolbar_model_; 44 scoped_ptr<ToolbarModel> toolbar_model_;
45 JavaObjectWeakGlobalRef weak_java_delegate_; 45 JavaObjectWeakGlobalRef weak_java_delegate_;
46 46
47 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelAndroid); 47 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelAndroid);
48 }; 48 };
49 49
50 #endif // CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_ 50 #endif // CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/navigation_popup.h ('k') | components/navigation_interception/intercept_navigation_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698