Landed by mistake. Reverting

Revert 134830 - Added support in Metro mode for retrieving the information about the currently
displayed tab url and title. This is retrieved via a registered window message sent
by the metro driver. The information is used by the share charm in metro.

BUG=125673
R=cpu,sky
Review URL: https://chromiumcodereview.appspot.com/10291007

TBR=ananta@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10286004

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

chrome/browser/ui/views/frame/browser_frame_win.cc

@@ -10,8 +10,6 @@
 #include <set>
 
 #include "base/command_line.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ -26,9 +24,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/page_navigator.h"
-#include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
-#include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/models/simple_menu_model.h"
@@ -54,20 +50,6 @@ static int explicit_show_state = -1;
 
 using content::OpenURLParams;
 using content::Referrer;
-using content::WebContents;
-
-namespace {
-
-void LocalAllocAndCopyString(const wchar_t* src, wchar_t** dest) {
-  DCHECK(src);
-  DCHECK(dest);
-
-  size_t dest_size = (wcslen(src) + 1) * sizeof(wchar_t);
-  *dest = reinterpret_cast<wchar_t*>(LocalAlloc(LPTR, dest_size));
-  base::wcslcpy(*dest, src, dest_size);
-}
-
-}  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, public:
@@ -226,15 +208,9 @@ LRESULT BrowserFrameWin::OnWndProc(UINT message,
                                    LPARAM l_param) {
   static const UINT metro_navigation_search_message =
       RegisterWindowMessage(chrome::kMetroNavigationAndSearchMessage);
+  if (message == metro_navigation_search_message)
+    HandleMetroRequest(w_param, l_param);
 
-  static const UINT metro_get_current_tab_info_message =
-      RegisterWindowMessage(chrome::kMetroGetCurrentTabInfoMessage);
-
-  if (message == metro_navigation_search_message) {
-    HandleMetroNavSearchRequest(w_param, l_param);
-  } else if (message == metro_get_current_tab_info_message) {
-    GetMetroCurrentTabInfo(w_param);
-  }
   return views::NativeWidgetWin::OnWndProc(message, w_param, l_param);
 }
 
@@ -331,8 +307,7 @@ void BrowserFrameWin::AddFrameToggleItems() {
   }
 }
 
-void BrowserFrameWin::HandleMetroNavSearchRequest(WPARAM w_param,
-                                                  LPARAM l_param) {
+void BrowserFrameWin::HandleMetroRequest(WPARAM w_param, LPARAM l_param) {
   if (!base::win::GetMetroModule()) {
     NOTREACHED() << "Received unexpected metro navigation request";
     return;
@@ -371,35 +346,6 @@ void BrowserFrameWin::HandleMetroNavSearchRequest(WPARAM w_param,
   }
 }
 
-void BrowserFrameWin::GetMetroCurrentTabInfo(WPARAM w_param) {
-  if (!base::win::GetMetroModule()) {
-    NOTREACHED() << "Received unexpected metro request";
-    return;
-  }
-
-  if (!w_param) {
-    NOTREACHED() << "Invalid metro request parameter";
-    return;
-  }
-
-  base::win::CurrentTabInfo* current_tab_info =
-      reinterpret_cast<base::win::CurrentTabInfo*>(w_param);
-
-  Browser* browser = browser_view()->browser();
-  DCHECK(browser);
-
-  // We allocate memory for the title and url via LocalAlloc. The caller has to
-  // free the memory via LocalFree.
-  LocalAllocAndCopyString(browser->GetWindowTitleForCurrentTab().c_str(),
-                          &current_tab_info->title);
-
-  WebContents* current_tab = browser->GetSelectedWebContents();
-  DCHECK(current_tab);
-
-  LocalAllocAndCopyString(UTF8ToWide(current_tab->GetURL().spec()).c_str(),
-                          &current_tab_info->url);
-}
-
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:

chrome/browser/ui/views/frame/browser_frame_win.h

@@ -77,11 +77,8 @@ class BrowserFrameWin : public views::NativeWidgetWin,
   // Adds optional debug items for frame type toggling.
   void AddFrameToggleItems();
 
-  // Handles metro navigation and search requests.
-  void HandleMetroNavSearchRequest(WPARAM w_param, LPARAM l_param);
-
-  // Returns information about the currently displayed tab in metro mode.
-  void GetMetroCurrentTabInfo(WPARAM w_param);
+  // Handles metro navigation search requests.
+  void HandleMetroRequest(WPARAM w_param, LPARAM l_param);
 
   // The BrowserView is our ClientView. This is a pointer to it.
   BrowserView* browser_view_;

chrome/common/chrome_constants.cc

@@ -203,8 +203,7 @@ const char kPreReadEnvironmentVariable[] = "CHROME_PRE_READ_EXPERIMENT";
 const wchar_t kMetroChromeUserDataSubDir[] = L"Metro";
 const wchar_t kMetroNavigationAndSearchMessage[] =
     L"CHROME_METRO_NAV_SEARCH_REQUEST";
-const wchar_t kMetroGetCurrentTabInfoMessage[] =
-    L"CHROME_METRO_GET_CURRENT_TAB_INFO";
+
 #endif
 
 }  // namespace chrome

chrome/common/chrome_constants.h

@@ -134,8 +134,6 @@ extern const char kPreReadEnvironmentVariable[];
 extern const wchar_t kMetroChromeUserDataSubDir[];
 // Used by Metro Chrome to initiate navigation and search requests.
 extern const wchar_t kMetroNavigationAndSearchMessage[];
-// Used by Metro Chrome to get information about the current tab.
-extern const wchar_t kMetroGetCurrentTabInfoMessage[];
 #endif
 
 }  // namespace chrome