Reverting 21032.

It breaks the release build on Windows.

TBR=ben
Review URL: http://codereview.chromium.org/155736

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21035 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 22 insertions, 34 deletions

diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index e7099ac..ecc6e5c 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -458,7 +458,7 @@ bool RenderViewContextMenu::ItemIsChecked(int id) const {
     return (params_.media_params.player_state &
             ContextMenuMediaParams::PLAYER_LOOP) != 0;
   }
-
+ 
   // Check box for 'Check the Spelling of this field'.
   if (id == IDC_CHECK_SPELLING_OF_THIS_FIELD) {
     return (params_.spellcheck_enabled &&
@@ -571,10 +571,18 @@ void RenderViewContextMenu::ExecuteItemCommand(int id) {
       break;
 
     case IDS_CONTENT_CONTEXT_VIEWPAGEINFO: {
+#if defined(OS_WIN) || defined(OS_MACOSX)
       NavigationEntry* nav_entry =
           source_tab_contents_->controller().GetActiveEntry();
-      source_tab_contents_->ShowPageInfo(nav_entry->url(), nav_entry->ssl(),
-                                         true);
+      PageInfoWindow::CreatePageInfo(
+          profile_,
+          nav_entry,
+          source_tab_contents_->GetContentNativeView(),
+          PageInfoWindow::SECURITY);
+#else
+     // TODO(port): port PageInfoWindow.
+     NOTIMPLEMENTED() << "IDS_CONTENT_CONTEXT_VIEWPAGEINFO";
+#endif
       break;
     }
 
@@ -618,8 +626,17 @@ void RenderViewContextMenu::ExecuteItemCommand(int id) {
         ssl.set_cert_status(cert_status);
         ssl.set_security_bits(security_bits);
       }
-      source_tab_contents_->ShowPageInfo(params_.frame_url, ssl,
-                                         false);  // Don't show the history.
+#if defined(OS_WIN) || defined(OS_MACOSX)
+      PageInfoWindow::CreateFrameInfo(
+          profile_,
+          params_.frame_url,
+          ssl,
+          source_tab_contents_->GetContentNativeView(),
+          PageInfoWindow::SECURITY);
+#else
+      // TODO(port): port PageInfoWindow.
+      NOTIMPLEMENTED() << "IDS_CONTENT_CONTEXT_VIEWFRAMEINFO";
+#endif
       break;
     }
 
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index ffb6d7d..38b7a3e 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -751,16 +751,6 @@ void TabContents::CreateShortcut() {
   render_view_host()->GetApplicationInfo(pending_install_.page_id);
 }
 
-void TabContents::ShowPageInfo(const GURL& url,
-                               const NavigationEntry::SSLStatus& ssl,
-                               bool show_history) {
-  if (!delegate_)
-    return;
-
-  delegate_->ShowPageInfo(GetContentNativeView(), profile(), url, ssl,
-                          show_history);
-}
-
 #if defined(OS_WIN) || defined(OS_LINUX)
 ConstrainedWindow* TabContents::CreateConstrainedDialog(
       ConstrainedWindowDelegate* delegate) {
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index 67e7ccd..e974f8e 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -26,7 +26,6 @@
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/render_view_host_manager.h"
 #include "chrome/common/gears_api.h"
@@ -328,11 +327,6 @@ class TabContents : public PageNavigator,
   // Tell Gears to create a shortcut for the current page.
   void CreateShortcut();
 
-  // Shows the page info.
-  void ShowPageInfo(const GURL& url,
-                    const NavigationEntry::SSLStatus& ssl,
-                    bool show_history);
-
   // Window management ---------------------------------------------------------
 
 #if defined(OS_WIN) || defined(OS_LINUX)
diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h
index 6db5e4a..b00f31f 100644
--- a/chrome/browser/tab_contents/tab_contents_delegate.h
+++ b/chrome/browser/tab_contents/tab_contents_delegate.h
@@ -8,8 +8,6 @@
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/rect.h"
-
-#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/renderer_preferences.h"
@@ -208,17 +206,6 @@ class TabContentsDelegate {
                                         Profile* profile) {
   }
 
-  // Shows the page info using the specified information.
-  // |url| is the url of the page/frame the info applies to, |ssl| is the SSL
-  // information for that page/frame.  If |show_history| is true, a section
-  // showing how many times that URL has been visited is added to the page info.
-  virtual void ShowPageInfo(gfx::NativeView parent,
-                            Profile* profile,
-                            const GURL& url,
-                            const NavigationEntry::SSLStatus& ssl,
-                            bool show_history) {
-  }
-
   // Allows delegates to handle unhandled keyboard messages coming back from
   // the renderer.
   // Returns true if the keyboard message was handled.