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

Side by Side Diff: chrome/browser/ui/android/infobars/infobar_container_android.cc

Issue 228293004: InfoBarService inherits from InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: whitespace 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" 5 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "chrome/browser/infobars/infobar.h" 10 #include "chrome/browser/infobars/infobar.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 84
85 // Native JNI methods --------------------------------------------------------- 85 // Native JNI methods ---------------------------------------------------------
86 86
87 static jlong Init(JNIEnv* env, 87 static jlong Init(JNIEnv* env,
88 jobject obj, 88 jobject obj,
89 jobject web_contents, 89 jobject web_contents,
90 jobject auto_login_delegate) { 90 jobject auto_login_delegate) {
91 InfoBarContainerAndroid* infobar_container = 91 InfoBarContainerAndroid* infobar_container =
92 new InfoBarContainerAndroid(env, obj, auto_login_delegate); 92 new InfoBarContainerAndroid(env, obj, auto_login_delegate);
93 InfoBarManager* infobar_manager = 93 InfoBarService* infobar_service = InfoBarService::FromWebContents(
94 InfoBarService::InfoBarManagerFromWebContents( 94 content::WebContents::FromJavaWebContents(web_contents));
95 content::WebContents::FromJavaWebContents(web_contents)); 95 infobar_container->ChangeInfoBarManager(infobar_service);
96 infobar_container->ChangeInfoBarManager(infobar_manager);
97 return reinterpret_cast<intptr_t>(infobar_container); 96 return reinterpret_cast<intptr_t>(infobar_container);
98 } 97 }
99 98
100 bool RegisterInfoBarContainer(JNIEnv* env) { 99 bool RegisterInfoBarContainer(JNIEnv* env) {
101 return RegisterNativesImpl(env); 100 return RegisterNativesImpl(env);
102 } 101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698