OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/android/chrome_web_contents_delegate_android.h" | 5 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 } | 301 } |
302 } | 302 } |
303 | 303 |
304 return WebContentsDelegateAndroid::OpenURLFromTab(source, params); | 304 return WebContentsDelegateAndroid::OpenURLFromTab(source, params); |
305 } | 305 } |
306 | 306 |
307 void ChromeWebContentsDelegateAndroid::AddNewContents( | 307 void ChromeWebContentsDelegateAndroid::AddNewContents( |
308 WebContents* source, | 308 WebContents* source, |
309 WebContents* new_contents, | 309 WebContents* new_contents, |
310 WindowOpenDisposition disposition, | 310 WindowOpenDisposition disposition, |
311 const gfx::Rect& initial_pos, | 311 const gfx::Rect& initial_rect, |
312 bool user_gesture, | 312 bool user_gesture, |
313 bool* was_blocked) { | 313 bool* was_blocked) { |
314 // No code for this yet. | 314 // No code for this yet. |
315 DCHECK_NE(disposition, SAVE_TO_DISK); | 315 DCHECK_NE(disposition, SAVE_TO_DISK); |
316 // Can't create a new contents for the current tab - invalid case. | 316 // Can't create a new contents for the current tab - invalid case. |
317 DCHECK_NE(disposition, CURRENT_TAB); | 317 DCHECK_NE(disposition, CURRENT_TAB); |
318 | 318 |
319 TabHelpers::AttachTabHelpers(new_contents); | 319 TabHelpers::AttachTabHelpers(new_contents); |
320 | 320 |
321 JNIEnv* env = AttachCurrentThread(); | 321 JNIEnv* env = AttachCurrentThread(); |
(...skipping 21 matching lines...) Expand all Loading... |
343 | 343 |
344 if (was_blocked) | 344 if (was_blocked) |
345 *was_blocked = !(add_result == ADD_WEB_CONTENTS_RESULT_PROCEED); | 345 *was_blocked = !(add_result == ADD_WEB_CONTENTS_RESULT_PROCEED); |
346 | 346 |
347 if (add_result == ADD_WEB_CONTENTS_RESULT_STOP_LOAD_AND_DELETE) | 347 if (add_result == ADD_WEB_CONTENTS_RESULT_STOP_LOAD_AND_DELETE) |
348 delete new_contents; | 348 delete new_contents; |
349 } | 349 } |
350 | 350 |
351 } // namespace android | 351 } // namespace android |
352 } // namespace chrome | 352 } // namespace chrome |
OLD | NEW |