| 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 CHROME_BROWSER_ANDROID_BOTTOMBAR_OVERLAY_PANEL_CONTENT_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_BOTTOMBAR_OVERLAY_PANEL_CONTENT_H_ |
| 6 #define CHROME_BROWSER_ANDROID_BOTTOMBAR_OVERLAY_PANEL_CONTENT_H_ | 6 #define CHROME_BROWSER_ANDROID_BOTTOMBAR_OVERLAY_PANEL_CONTENT_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 "base/memory/scoped_ptr.h" |
| 10 #include "base/task/cancelable_task_tracker.h" | 11 #include "base/task/cancelable_task_tracker.h" |
| 11 #include "chrome/browser/android/contextualsearch/contextual_search_context.h" | 12 #include "chrome/browser/android/contextualsearch/contextual_search_context.h" |
| 12 | 13 |
| 13 namespace content { | 14 namespace content { |
| 14 class WebContents; | 15 class WebContents; |
| 15 } // namespace content | 16 } // namespace content |
| 16 | 17 |
| 17 namespace web_contents_delegate_android { | 18 namespace web_contents_delegate_android { |
| 18 class WebContentsDelegateAndroid; | 19 class WebContentsDelegateAndroid; |
| 19 } // namespace web_contents_delegate_android | 20 } // namespace web_contents_delegate_android |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 scoped_ptr<content::WebContents> web_contents_; | 69 scoped_ptr<content::WebContents> web_contents_; |
| 69 scoped_ptr<web_contents_delegate_android::WebContentsDelegateAndroid> | 70 scoped_ptr<web_contents_delegate_android::WebContentsDelegateAndroid> |
| 70 web_contents_delegate_; | 71 web_contents_delegate_; |
| 71 | 72 |
| 72 DISALLOW_COPY_AND_ASSIGN(OverlayPanelContent); | 73 DISALLOW_COPY_AND_ASSIGN(OverlayPanelContent); |
| 73 }; | 74 }; |
| 74 | 75 |
| 75 bool RegisterOverlayPanelContent(JNIEnv* env); | 76 bool RegisterOverlayPanelContent(JNIEnv* env); |
| 76 | 77 |
| 77 #endif // CHROME_BROWSER_ANDROID_BOTTOMBAR_OVERLAY_PANEL_CONTENT_H_ | 78 #endif // CHROME_BROWSER_ANDROID_BOTTOMBAR_OVERLAY_PANEL_CONTENT_H_ |
| OLD | NEW |