Commit 1da92ab8 authored by ananta@chromium.org's avatar ananta@chromium.org

Add support initiating navigations/search requests in Chrome metro mode via a registered

window message. This is done by overriding the WindowImpl::OnWndProc virtual function in
the BrowserFrameWin class which subclasses the NativeWidgetWin instance for the browser
frame.

BUG=118641
R=sky,cpu
Review URL: https://chromiumcodereview.appspot.com/10275002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134602 0039d316-1c4b-4281-b951-d872f2087c98
parent 92d32d88
...@@ -10,14 +10,21 @@ ...@@ -10,14 +10,21 @@
#include <set> #include <set>
#include "base/command_line.h" #include "base/command_line.h"
#include "base/win/metro.h"
#include "chrome/app/chrome_command_ids.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/browser_list.h"
#include "chrome/browser/ui/toolbar/wrench_menu_model.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/browser_view.h"
#include "chrome/browser/ui/views/frame/system_menu_model.h" #include "chrome/browser/ui/views/frame/system_menu_model.h"
#include "chrome/browser/ui/views/frame/system_menu_model_delegate.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 "chrome/common/chrome_switches.h"
#include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/browser_accessibility_state.h"
#include "content/public/browser/page_navigator.h"
#include "content/public/common/page_transition_types.h"
#include "grit/generated_resources.h" #include "grit/generated_resources.h"
#include "grit/theme_resources.h" #include "grit/theme_resources.h"
#include "ui/base/models/simple_menu_model.h" #include "ui/base/models/simple_menu_model.h"
...@@ -28,6 +35,7 @@ ...@@ -28,6 +35,7 @@
#include "ui/views/widget/native_widget_win.h" #include "ui/views/widget/native_widget_win.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
#include "ui/views/window/non_client_view.h" #include "ui/views/window/non_client_view.h"
#include "webkit/glue/window_open_disposition.h"
#pragma comment(lib, "dwmapi.lib") #pragma comment(lib, "dwmapi.lib")
...@@ -40,6 +48,9 @@ static const int kDWMFrameTopOffset = 3; ...@@ -40,6 +48,9 @@ static const int kDWMFrameTopOffset = 3;
// If not -1, windows are shown with this state. // If not -1, windows are shown with this state.
static int explicit_show_state = -1; static int explicit_show_state = -1;
using content::OpenURLParams;
using content::Referrer;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// BrowserFrameWin, public: // BrowserFrameWin, public:
...@@ -192,6 +203,17 @@ void BrowserFrameWin::TabStripDisplayModeChanged() { ...@@ -192,6 +203,17 @@ void BrowserFrameWin::TabStripDisplayModeChanged() {
UpdateDWMFrame(); 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);
return views::NativeWidgetWin::OnWndProc(message, w_param, l_param);
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// BrowserFrameWin, private: // BrowserFrameWin, private:
...@@ -285,6 +307,46 @@ void BrowserFrameWin::AddFrameToggleItems() { ...@@ -285,6 +307,46 @@ void BrowserFrameWin::AddFrameToggleItems() {
} }
} }
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;
}
Browser* browser = browser_view()->browser();
DCHECK(browser);
GURL request_url;
if (w_param) {
const wchar_t* url = reinterpret_cast<const wchar_t*>(w_param);
request_url = GURL(url);
} else if (l_param) {
const wchar_t* search_string =
reinterpret_cast<const wchar_t*>(l_param);
const TemplateURL* default_provider =
TemplateURLServiceFactory::GetForProfile(browser->profile())->
GetDefaultSearchProvider();
if (default_provider) {
const TemplateURLRef& search_url = default_provider->url_ref();
DCHECK(search_url.SupportsReplacement());
request_url = GURL(search_url.ReplaceSearchTerms(search_string,
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
string16()));
}
}
if (request_url.is_valid()) {
browser->OpenURL(OpenURLParams(request_url, Referrer(), NEW_FOREGROUND_TAB,
content::PAGE_TRANSITION_TYPED, false));
}
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BrowserFrame, public: // BrowserFrame, public:
......
...@@ -61,6 +61,11 @@ class BrowserFrameWin : public views::NativeWidgetWin, ...@@ -61,6 +61,11 @@ class BrowserFrameWin : public views::NativeWidgetWin,
virtual int GetMinimizeButtonOffset() const OVERRIDE; virtual int GetMinimizeButtonOffset() const OVERRIDE;
virtual void TabStripDisplayModeChanged() OVERRIDE; virtual void TabStripDisplayModeChanged() OVERRIDE;
// Overridden from WindowImpl:
virtual LRESULT OnWndProc(UINT message,
WPARAM w_param,
LPARAM l_param) OVERRIDE;
private: private:
// Updates the DWM with the frame bounds. // Updates the DWM with the frame bounds.
void UpdateDWMFrame(); void UpdateDWMFrame();
...@@ -72,6 +77,9 @@ class BrowserFrameWin : public views::NativeWidgetWin, ...@@ -72,6 +77,9 @@ class BrowserFrameWin : public views::NativeWidgetWin,
// Adds optional debug items for frame type toggling. // Adds optional debug items for frame type toggling.
void AddFrameToggleItems(); void AddFrameToggleItems();
// Handles metro navigation search requests.
void HandleMetroRequest(WPARAM w_param, LPARAM l_param);
// The BrowserView is our ClientView. This is a pointer to it. // The BrowserView is our ClientView. This is a pointer to it.
BrowserView* browser_view_; BrowserView* browser_view_;
......
...@@ -201,6 +201,9 @@ extern const int kHighestRendererOomScore = 1000; ...@@ -201,6 +201,9 @@ extern const int kHighestRendererOomScore = 1000;
// This is used by the PreRead experiment. // This is used by the PreRead experiment.
const char kPreReadEnvironmentVariable[] = "CHROME_PRE_READ_EXPERIMENT"; const char kPreReadEnvironmentVariable[] = "CHROME_PRE_READ_EXPERIMENT";
const wchar_t kMetroChromeUserDataSubDir[] = L"Metro"; const wchar_t kMetroChromeUserDataSubDir[] = L"Metro";
const wchar_t kMetroNavigationAndSearchMessage[] =
L"CHROME_METRO_NAV_SEARCH_REQUEST";
#endif #endif
} // namespace chrome } // namespace chrome
......
...@@ -132,6 +132,8 @@ extern const int kHighestRendererOomScore; ...@@ -132,6 +132,8 @@ extern const int kHighestRendererOomScore;
extern const char kPreReadEnvironmentVariable[]; extern const char kPreReadEnvironmentVariable[];
// Used by Metro Chrome to create the profile under a custom subdirectory. // Used by Metro Chrome to create the profile under a custom subdirectory.
extern const wchar_t kMetroChromeUserDataSubDir[]; extern const wchar_t kMetroChromeUserDataSubDir[];
// Used by Metro Chrome to initiate navigation and search requests.
extern const wchar_t kMetroNavigationAndSearchMessage[];
#endif #endif
} // namespace chrome } // namespace chrome
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment