| Index: components/navigation_interception/intercept_navigation_delegate.h
|
| diff --git a/content/components/navigation_interception/intercept_navigation_delegate.h b/components/navigation_interception/intercept_navigation_delegate.h
|
| similarity index 85%
|
| rename from content/components/navigation_interception/intercept_navigation_delegate.h
|
| rename to components/navigation_interception/intercept_navigation_delegate.h
|
| index ab60a68e769836109b229e0ac1d247d2d41882f3..66a2518d7a0f92c91946cf49a5181699996cb7c3 100644
|
| --- a/content/components/navigation_interception/intercept_navigation_delegate.h
|
| +++ b/components/navigation_interception/intercept_navigation_delegate.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
|
| -#define CONTENT_COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
|
| +#ifndef COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
|
| +#define COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
|
|
|
| #include "base/android/jni_helper.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -21,7 +21,7 @@ namespace net {
|
| class URLRequest;
|
| }
|
|
|
| -namespace content {
|
| +namespace components {
|
|
|
| // Native side of the InterceptNavigationDelegate Java interface.
|
| // This is used to create a InterceptNavigationResourceThrottle that calls the
|
| @@ -57,13 +57,13 @@ class InterceptNavigationDelegate : public base::SupportsUserData::Data {
|
| virtual bool ShouldIgnoreNavigation(const GURL& url,
|
| bool is_post,
|
| bool has_user_gesture,
|
| - PageTransition transition_type);
|
| + content::PageTransition transition_type);
|
| private:
|
| JavaObjectWeakGlobalRef weak_jdelegate_;
|
| };
|
|
|
| bool RegisterInterceptNavigationDelegate(JNIEnv* env);
|
|
|
| -} // namespace content
|
| +} // namespace components
|
|
|
| -#endif // CONTENT_COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
|
| +#endif // COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
|
|
|