Landed by mistake. Reverting

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

 // 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.
 
 #include "chrome/browser/ui/views/frame/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #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"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_model.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #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"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/menu/native_menu_win.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_win.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 #pragma comment(lib, "dwmapi.lib")
 
 // static
 static const int kClientEdgeThickness = 3;
 static const int kTabDragWindowAlpha = 200;
 // We need to offset the DWMFrame into the toolbar so that the blackness
 // doesn't show up on our rounded corners.
 static const int kDWMFrameTopOffset = 3;
 // If not -1, windows are shown with this state.
 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:
 
 BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame,
                                  BrowserView* browser_view)
     : views::NativeWidgetWin(browser_frame),
       browser_view_(browser_view),
       browser_frame_(browser_frame),
       system_menu_delegate_(new SystemMenuModelDelegate(browser_view,
@@ skipping 138 matching lines @@
 
 void BrowserFrameWin::TabStripDisplayModeChanged() {
   UpdateDWMFrame();
 }
 
 LRESULT BrowserFrameWin::OnWndProc(UINT message,
                                    WPARAM w_param,
                                    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);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, private:
 
 void BrowserFrameWin::UpdateDWMFrame() {
   // Nothing to do yet, or we're not showing a DWM frame.
   if (!GetWidget()->client_view() || !browser_frame_->ShouldUseNativeFrame())
     return;
@@ skipping 76 matching lines @@
 
 void BrowserFrameWin::AddFrameToggleItems() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDebugEnableFrameToggle)) {
     system_menu_contents_->AddSeparator();
     system_menu_contents_->AddItem(IDC_DEBUG_FRAME_TOGGLE,
                                    L"Toggle Frame Type");
   }
 }
 
-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;
   }
 
   if (!w_param && !l_param) {
     NOTREACHED() << "Invalid metro request parameters";
     return;
   }
 
@@ skipping 18 matching lines @@
                             TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
                             string16()));
     }
   }
   if (request_url.is_valid()) {
     browser->OpenURL(OpenURLParams(request_url, Referrer(), NEW_FOREGROUND_TAB,
                                    content::PAGE_TRANSITION_TYPED, false));
   }
 }
 
-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:
 
 // static
 const gfx::Font& BrowserFrame::GetTitleFont() {
   static gfx::Font* title_font =
       new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont());
   return *title_font;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }