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

Side by Side 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, 7 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/frame/browser_frame_win.h" 5 #include "chrome/browser/ui/views/frame/browser_frame_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <set> 10 #include <set>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/win/metro.h"
13 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/search_engines/template_url.h"
16 #include "chrome/browser/search_engines/template_url_service.h"
17 #include "chrome/browser/search_engines/template_url_service_factory.h"
14 #include "chrome/browser/ui/browser_list.h" 18 #include "chrome/browser/ui/browser_list.h"
15 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 19 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
16 #include "chrome/browser/ui/views/frame/browser_view.h" 20 #include "chrome/browser/ui/views/frame/browser_view.h"
17 #include "chrome/browser/ui/views/frame/system_menu_model.h" 21 #include "chrome/browser/ui/views/frame/system_menu_model.h"
18 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" 22 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
23 #include "chrome/common/chrome_constants.h"
19 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
20 #include "content/public/browser/browser_accessibility_state.h" 25 #include "content/public/browser/browser_accessibility_state.h"
26 #include "content/public/browser/page_navigator.h"
27 #include "content/public/common/page_transition_types.h"
21 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
22 #include "grit/theme_resources.h" 29 #include "grit/theme_resources.h"
23 #include "ui/base/models/simple_menu_model.h" 30 #include "ui/base/models/simple_menu_model.h"
24 #include "ui/base/theme_provider.h" 31 #include "ui/base/theme_provider.h"
25 #include "ui/gfx/font.h" 32 #include "ui/gfx/font.h"
26 #include "ui/views/controls/menu/native_menu_win.h" 33 #include "ui/views/controls/menu/native_menu_win.h"
27 #include "ui/views/views_delegate.h" 34 #include "ui/views/views_delegate.h"
28 #include "ui/views/widget/native_widget_win.h" 35 #include "ui/views/widget/native_widget_win.h"
29 #include "ui/views/widget/widget.h" 36 #include "ui/views/widget/widget.h"
30 #include "ui/views/window/non_client_view.h" 37 #include "ui/views/window/non_client_view.h"
38 #include "webkit/glue/window_open_disposition.h"
31 39
32 #pragma comment(lib, "dwmapi.lib") 40 #pragma comment(lib, "dwmapi.lib")
33 41
34 // static 42 // static
35 static const int kClientEdgeThickness = 3; 43 static const int kClientEdgeThickness = 3;
36 static const int kTabDragWindowAlpha = 200; 44 static const int kTabDragWindowAlpha = 200;
37 // We need to offset the DWMFrame into the toolbar so that the blackness 45 // We need to offset the DWMFrame into the toolbar so that the blackness
38 // doesn't show up on our rounded corners. 46 // doesn't show up on our rounded corners.
39 static const int kDWMFrameTopOffset = 3; 47 static const int kDWMFrameTopOffset = 3;
40 // If not -1, windows are shown with this state. 48 // If not -1, windows are shown with this state.
41 static int explicit_show_state = -1; 49 static int explicit_show_state = -1;
42 50
51 using content::OpenURLParams;
52 using content::Referrer;
53
43 /////////////////////////////////////////////////////////////////////////////// 54 ///////////////////////////////////////////////////////////////////////////////
44 // BrowserFrameWin, public: 55 // BrowserFrameWin, public:
45 56
46 BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame, 57 BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame,
47 BrowserView* browser_view) 58 BrowserView* browser_view)
48 : views::NativeWidgetWin(browser_frame), 59 : views::NativeWidgetWin(browser_frame),
49 browser_view_(browser_view), 60 browser_view_(browser_view),
50 browser_frame_(browser_frame), 61 browser_frame_(browser_frame),
51 system_menu_delegate_(new SystemMenuModelDelegate(browser_view, 62 system_menu_delegate_(new SystemMenuModelDelegate(browser_view,
52 browser_view->browser())) { 63 browser_view->browser())) {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 titlebar_info.rgrect[2].top); 196 titlebar_info.rgrect[2].top);
186 MapWindowPoints(HWND_DESKTOP, GetNativeView(), &minimize_button_corner, 1); 197 MapWindowPoints(HWND_DESKTOP, GetNativeView(), &minimize_button_corner, 1);
187 198
188 return minimize_button_corner.x; 199 return minimize_button_corner.x;
189 } 200 }
190 201
191 void BrowserFrameWin::TabStripDisplayModeChanged() { 202 void BrowserFrameWin::TabStripDisplayModeChanged() {
192 UpdateDWMFrame(); 203 UpdateDWMFrame();
193 } 204 }
194 205
206 LRESULT BrowserFrameWin::OnWndProc(UINT message,
207 WPARAM w_param,
208 LPARAM l_param) {
209 static const UINT metro_navigation_search_message =
210 RegisterWindowMessage(chrome::kMetroNavigationAndSearchMessage);
211 if (message == metro_navigation_search_message)
212 HandleMetroRequest(w_param, l_param);
213
214 return views::NativeWidgetWin::OnWndProc(message, w_param, l_param);
215 }
216
195 /////////////////////////////////////////////////////////////////////////////// 217 ///////////////////////////////////////////////////////////////////////////////
196 // BrowserFrameWin, private: 218 // BrowserFrameWin, private:
197 219
198 void BrowserFrameWin::UpdateDWMFrame() { 220 void BrowserFrameWin::UpdateDWMFrame() {
199 // Nothing to do yet, or we're not showing a DWM frame. 221 // Nothing to do yet, or we're not showing a DWM frame.
200 if (!GetWidget()->client_view() || !browser_frame_->ShouldUseNativeFrame()) 222 if (!GetWidget()->client_view() || !browser_frame_->ShouldUseNativeFrame())
201 return; 223 return;
202 224
203 MARGINS margins = { 0 }; 225 MARGINS margins = { 0 };
204 if (browser_view_->IsBrowserTypeNormal()) { 226 if (browser_view_->IsBrowserTypeNormal()) {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 300
279 void BrowserFrameWin::AddFrameToggleItems() { 301 void BrowserFrameWin::AddFrameToggleItems() {
280 if (CommandLine::ForCurrentProcess()->HasSwitch( 302 if (CommandLine::ForCurrentProcess()->HasSwitch(
281 switches::kDebugEnableFrameToggle)) { 303 switches::kDebugEnableFrameToggle)) {
282 system_menu_contents_->AddSeparator(); 304 system_menu_contents_->AddSeparator();
283 system_menu_contents_->AddItem(IDC_DEBUG_FRAME_TOGGLE, 305 system_menu_contents_->AddItem(IDC_DEBUG_FRAME_TOGGLE,
284 L"Toggle Frame Type"); 306 L"Toggle Frame Type");
285 } 307 }
286 } 308 }
287 309
310 void BrowserFrameWin::HandleMetroRequest(WPARAM w_param, LPARAM l_param) {
311 if (!base::win::GetMetroModule()) {
312 NOTREACHED() << "Received unexpected metro navigation request";
313 return;
314 }
315
316 if (!w_param && !l_param) {
317 NOTREACHED() << "Invalid metro request parameters";
318 return;
319 }
320
321 Browser* browser = browser_view()->browser();
322 DCHECK(browser);
323
324 GURL request_url;
325
326 if (w_param) {
327 const wchar_t* url = reinterpret_cast<const wchar_t*>(w_param);
328 request_url = GURL(url);
329 } else if (l_param) {
330 const wchar_t* search_string =
331 reinterpret_cast<const wchar_t*>(l_param);
332 const TemplateURL* default_provider =
333 TemplateURLServiceFactory::GetForProfile(browser->profile())->
334 GetDefaultSearchProvider();
335 if (default_provider) {
336 const TemplateURLRef& search_url = default_provider->url_ref();
337 DCHECK(search_url.SupportsReplacement());
338 request_url = GURL(search_url.ReplaceSearchTerms(search_string,
339 TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
340 string16()));
341 }
342 }
343 if (request_url.is_valid()) {
344 browser->OpenURL(OpenURLParams(request_url, Referrer(), NEW_FOREGROUND_TAB,
345 content::PAGE_TRANSITION_TYPED, false));
346 }
347 }
348
349
288 //////////////////////////////////////////////////////////////////////////////// 350 ////////////////////////////////////////////////////////////////////////////////
289 // BrowserFrame, public: 351 // BrowserFrame, public:
290 352
291 // static 353 // static
292 const gfx::Font& BrowserFrame::GetTitleFont() { 354 const gfx::Font& BrowserFrame::GetTitleFont() {
293 static gfx::Font* title_font = 355 static gfx::Font* title_font =
294 new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont()); 356 new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont());
295 return *title_font; 357 return *title_font;
296 } 358 }
297 359
298 //////////////////////////////////////////////////////////////////////////////// 360 ////////////////////////////////////////////////////////////////////////////////
299 // NativeBrowserFrame, public: 361 // NativeBrowserFrame, public:
300 362
301 // static 363 // static
302 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( 364 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
303 BrowserFrame* browser_frame, 365 BrowserFrame* browser_frame,
304 BrowserView* browser_view) { 366 BrowserView* browser_view) {
305 return new BrowserFrameWin(browser_frame, browser_view); 367 return new BrowserFrameWin(browser_frame, browser_view);
306 } 368 }
OLDNEW
« 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