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

Side by Side Diff: content/browser/android/content_view_client.cc

Issue 10640019: Remove the HANDLED_EXTERNALLY status code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed some minor issues Created 8 years, 5 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 (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 "content/browser/android/content_view_client.h" 5 #include "content/browser/android/content_view_client.h"
6 6
7 #include <android/keycodes.h> 7 #include <android/keycodes.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 return CONTENT_VIEW_CLIENT_ERROR_REDIRECT_LOOP; 478 return CONTENT_VIEW_CLIENT_ERROR_REDIRECT_LOOP;
479 479
480 case net::ERR_UPLOAD_FILE_CHANGED: 480 case net::ERR_UPLOAD_FILE_CHANGED:
481 return CONTENT_VIEW_CLIENT_ERROR_FILE_NOT_FOUND; 481 return CONTENT_VIEW_CLIENT_ERROR_FILE_NOT_FOUND;
482 482
483 case net::ERR_INVALID_URL: 483 case net::ERR_INVALID_URL:
484 return CONTENT_VIEW_CLIENT_ERROR_BAD_URL; 484 return CONTENT_VIEW_CLIENT_ERROR_BAD_URL;
485 485
486 case net::ERR_DISALLOWED_URL_SCHEME: 486 case net::ERR_DISALLOWED_URL_SCHEME:
487 case net::ERR_UNKNOWN_URL_SCHEME: 487 case net::ERR_UNKNOWN_URL_SCHEME:
488 case net::OK_HANDLED_EXTERNALLY:
488 return CONTENT_VIEW_CLIENT_ERROR_UNSUPPORTED_SCHEME; 489 return CONTENT_VIEW_CLIENT_ERROR_UNSUPPORTED_SCHEME;
489 490
490 case net::ERR_IO_PENDING: 491 case net::ERR_IO_PENDING:
491 case net::ERR_NETWORK_IO_SUSPENDED: 492 case net::ERR_NETWORK_IO_SUSPENDED:
492 return CONTENT_VIEW_CLIENT_ERROR_IO; 493 return CONTENT_VIEW_CLIENT_ERROR_IO;
493 494
494 case net::ERR_CONNECTION_TIMED_OUT: 495 case net::ERR_CONNECTION_TIMED_OUT:
495 case net::ERR_TIMED_OUT: 496 case net::ERR_TIMED_OUT:
496 return CONTENT_VIEW_CLIENT_ERROR_TIMEOUT; 497 return CONTENT_VIEW_CLIENT_ERROR_TIMEOUT;
497 498
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 586
586 bool RegisterContentViewClient(JNIEnv* env) { 587 bool RegisterContentViewClient(JNIEnv* env) {
587 if (!HasClass(env, kContentViewClientClassPath)) { 588 if (!HasClass(env, kContentViewClientClassPath)) {
588 DLOG(ERROR) << "Unable to find class ContentViewClient!"; 589 DLOG(ERROR) << "Unable to find class ContentViewClient!";
589 return false; 590 return false;
590 } 591 }
591 return RegisterNativesImpl(env); 592 return RegisterNativesImpl(env);
592 } 593 }
593 594
594 } // namespace content 595 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698