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

Unified Diff: chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h

Issue 11365199: Move WebContentsDelegateAndroid to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h
diff --git a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h
deleted file mode 100644
index 4fe40b989127db5176b6643bf53610decabf6542..0000000000000000000000000000000000000000
--- a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
-#define CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
-
-#include "base/android/jni_helper.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/native_web_keyboard_event.h"
-#include "content/public/browser/web_contents_delegate.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/javascript_message_type.h"
-#include "content/public/common/referrer.h"
-#include "googleurl/src/gurl.h"
-#include "net/base/net_errors.h"
-
-namespace content {
-class JavaScriptDialogCreator;
-class RenderViewHost;
-class WebContents;
-class WebContentsObserver;
-struct NativeWebKeyboardEvent;
-}
-
-namespace web_contents_delegate_android {
-
-enum WebContentsDelegateLogLevel {
- // Equivalent of WebCore::WebConsoleMessage::LevelTip.
- WEB_CONTENTS_DELEGATE_LOG_LEVEL_TIP = 0,
- // Equivalent of WebCore::WebConsoleMessage::LevelLog.
- WEB_CONTENTS_DELEGATE_LOG_LEVEL_LOG = 1,
- // Equivalent of WebCore::WebConsoleMessage::LevelWarning.
- WEB_CONTENTS_DELEGATE_LOG_LEVEL_WARNING = 2,
- // Equivalent of WebCore::WebConsoleMessage::LevelError.
- WEB_CONTENTS_DELEGATE_LOG_LEVEL_ERROR = 3,
-};
-
-
-// Native underpinnings of WebContentsDelegateAndroid.java. Provides a default
-// delegate for WebContents to forward calls to the java peer. The embedding
-// application may subclass and override methods on either the C++ or Java side
-// as required.
-class WebContentsDelegateAndroid : public content::WebContentsDelegate {
- public:
- WebContentsDelegateAndroid(JNIEnv* env, jobject obj);
- virtual ~WebContentsDelegateAndroid();
-
- // Binds this WebContentsDelegateAndroid to the passed WebContents instance,
- // such that when that WebContents is destroyed, this
- // WebContentsDelegateAndroid instance will be destroyed too.
- void SetOwnerWebContents(content::WebContents* contents);
-
- // Overridden from WebContentsDelegate:
- virtual content::WebContents* OpenURLFromTab(
- content::WebContents* source,
- const content::OpenURLParams& params) OVERRIDE;
-
- virtual void NavigationStateChanged(const content::WebContents* source,
- unsigned changed_flags) OVERRIDE;
- virtual void AddNewContents(content::WebContents* source,
- content::WebContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture,
- bool* was_blocked) OVERRIDE;
- virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
- virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
- virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
- virtual void LoadProgressChanged(content::WebContents* source,
- double load_progress) OVERRIDE;
- virtual void CloseContents(content::WebContents* source) OVERRIDE;
- virtual void MoveContents(content::WebContents* source,
- const gfx::Rect& pos) OVERRIDE;
- virtual bool AddMessageToConsole(content::WebContents* source,
- int32 level,
- const string16& message,
- int32 line_no,
- const string16& source_id) OVERRIDE;
- // TODO(merge): WARNING! method no longer available on the base class.
- // See http://crbug.com/149477
- virtual void URLStarredChanged(content::WebContents* source, bool starred);
- virtual void UpdateTargetURL(content::WebContents* source,
- int32 page_id,
- const GURL& url) OVERRIDE;
- virtual void HandleKeyboardEvent(
- content::WebContents* source,
- const content::NativeWebKeyboardEvent& event) OVERRIDE;
- virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
-
- virtual void ShowRepostFormWarningDialog(
- content::WebContents* source) OVERRIDE;
-
- virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
- bool enter_fullscreen) OVERRIDE;
- virtual bool IsFullscreenForTabOrPending(
- const content::WebContents* web_contents) const OVERRIDE;
-
- protected:
- base::android::ScopedJavaLocalRef<jobject> GetJavaDelegate(JNIEnv* env) const;
-
- private:
- // We depend on the java side user of WebContentDelegateAndroid to hold a
- // strong reference to that object as long as they want to receive callbacks
- // on it. Using a weak ref here allows it to be correctly GCed.
- JavaObjectWeakGlobalRef weak_java_delegate_;
-};
-
-bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
-
-} // namespace web_contents_delegate_android
-
-#endif // CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698