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

Unified Diff: content/shell/shell.h

Issue 10806056: Move plugin_browsertests.cc from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to mac+win fixes 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/shell.h
===================================================================
--- content/shell/shell.h (revision 147965)
+++ content/shell/shell.h (working copy)
@@ -74,6 +74,7 @@
static void PlatformExit();
WebContents* web_contents() const { return web_contents_.get(); }
+ gfx::NativeWindow window() { return window_; }
#if defined(OS_MACOSX)
// Public to be called by an ObjC bridge object.
@@ -84,6 +85,28 @@
static bool Register(JNIEnv* env);
#endif
+ // WebContentsDelegate
+ virtual void LoadingStateChanged(WebContents* source) OVERRIDE;
+#if defined(OS_ANDROID)
+ virtual void LoadProgressChanged(double progress) OVERRIDE;
+#endif
+ virtual void WebContentsCreated(WebContents* source_contents,
+ int64 source_frame_id,
+ const GURL& target_url,
+ WebContents* new_contents) OVERRIDE;
+ virtual void DidNavigateMainFramePostCommit(
+ WebContents* web_contents) OVERRIDE;
+ virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE;
+#if defined(OS_MACOSX)
+ virtual void HandleKeyboardEvent(
+ const NativeWebKeyboardEvent& event) OVERRIDE;
+#endif
+ virtual bool AddMessageToConsole(WebContents* source,
+ int32 level,
+ const string16& message,
+ int32 line_no,
+ const string16& source_id) OVERRIDE;
+
private:
enum UIControl {
BACK_BUTTON,
@@ -122,28 +145,6 @@
gfx::NativeView GetContentView();
- // WebContentsDelegate
- virtual void LoadingStateChanged(WebContents* source) OVERRIDE;
-#if defined(OS_ANDROID)
- virtual void LoadProgressChanged(double progress) OVERRIDE;
-#endif
- virtual void WebContentsCreated(WebContents* source_contents,
- int64 source_frame_id,
- const GURL& target_url,
- WebContents* new_contents) OVERRIDE;
- virtual void DidNavigateMainFramePostCommit(
- WebContents* web_contents) OVERRIDE;
- virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE;
-#if defined(OS_MACOSX)
- virtual void HandleKeyboardEvent(
- const NativeWebKeyboardEvent& event) OVERRIDE;
-#endif
- virtual bool AddMessageToConsole(WebContents* source,
- int32 level,
- const string16& message,
- int32 line_no,
- const string16& source_id) OVERRIDE;
-
// NotificationObserver
virtual void Observe(int type,
const NotificationSource& source,

Powered by Google App Engine
This is Rietveld 408576698