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

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 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 17 matching lines...) Expand all
28 JNIEnv* env, 28 JNIEnv* env,
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 virtual content::WebContents* GetActiveWebContents() const OVERRIDE; 38 virtual content::WebContents* GetActiveWebContents() const override;
39 virtual bool InTabbedBrowser() const OVERRIDE; 39 virtual bool InTabbedBrowser() const override;
40 40
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/tab_model/tab_model_unittest.cc ('k') | chrome/browser/ui/android/website_settings_popup_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698