chrome/browser/ui/android/toolbar/toolbar_model_android.h - Issue 731423002: Remove OriginChip code.

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: chrome/browser/ui/android/toolbar/toolbar_model_android.h

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix gyp file and bad merge Created 5 years, 10 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 | « chrome/browser/search/search_unittest.cc ('k') | chrome/browser/ui/android/toolbar/toolbar_model_android.cc » ('j') | no next file with comments »

OLD	NEW
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_weak_ref.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"

(...skipping 18 matching lines...) Expand all Loading...
29 jobject obj);	29 jobject obj);

30 base::android::ScopedJavaLocalRef<jstring> GetQueryExtractionParam(	30 base::android::ScopedJavaLocalRef<jstring> GetQueryExtractionParam(

31 JNIEnv* env,	31 JNIEnv* env,

32 jobject obj);	32 jobject obj);

33 base::android::ScopedJavaLocalRef<jstring> GetCorpusChipText(	33 base::android::ScopedJavaLocalRef<jstring> GetCorpusChipText(

34 JNIEnv* env,	34 JNIEnv* env,

35 jobject obj);	35 jobject obj);

36	36

37 // ToolbarDelegate:	37 // ToolbarDelegate:

38 content::WebContents* GetActiveWebContents() const override;	38 content::WebContents* GetActiveWebContents() const override;

39 bool InTabbedBrowser() const override;

40	39

41 static bool RegisterToolbarModelAndroid(JNIEnv* env);	40 static bool RegisterToolbarModelAndroid(JNIEnv* env);

42	41

43 private:	42 private:

44 scoped_ptr<ToolbarModel> toolbar_model_;	43 scoped_ptr<ToolbarModel> toolbar_model_;

45 JavaObjectWeakGlobalRef weak_java_delegate_;	44 JavaObjectWeakGlobalRef weak_java_delegate_;

46	45

47 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelAndroid);	46 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelAndroid);

48 };	47 };

49	48

50 #endif // CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_	49 #endif // CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_

OLD	NEW