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

Unified Diff: chrome/browser/ui/views/frame/browser_frame_win.cc

Issue 10275002: Add support initiating navigations/search requests in Chrome metro mode via a registered (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_win.h ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_frame_win.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_frame_win.cc (revision 133976)
+++ chrome/browser/ui/views/frame/browser_frame_win.cc (working copy)
@@ -10,14 +10,21 @@
#include <set>
#include "base/command_line.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/common/page_transition_types.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/models/simple_menu_model.h"
@@ -28,6 +35,7 @@
#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")
@@ -40,6 +48,9 @@
// If not -1, windows are shown with this state.
static int explicit_show_state = -1;
+using content::OpenURLParams;
+using content::Referrer;
+
///////////////////////////////////////////////////////////////////////////////
// BrowserFrameWin, public:
@@ -192,6 +203,17 @@
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:
@@ -285,6 +307,46 @@
}
}
+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:
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_win.h ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698