OLD | NEW |
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 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
489 request_url = GURL(url); | 489 request_url = GURL(url); |
490 } else if (l_param) { | 490 } else if (l_param) { |
491 const wchar_t* search_string = | 491 const wchar_t* search_string = |
492 reinterpret_cast<const wchar_t*>(l_param); | 492 reinterpret_cast<const wchar_t*>(l_param); |
493 const TemplateURL* default_provider = | 493 const TemplateURL* default_provider = |
494 TemplateURLServiceFactory::GetForProfile(browser->profile())-> | 494 TemplateURLServiceFactory::GetForProfile(browser->profile())-> |
495 GetDefaultSearchProvider(); | 495 GetDefaultSearchProvider(); |
496 if (default_provider) { | 496 if (default_provider) { |
497 const TemplateURLRef& search_url = default_provider->url_ref(); | 497 const TemplateURLRef& search_url = default_provider->url_ref(); |
498 DCHECK(search_url.SupportsReplacement()); | 498 DCHECK(search_url.SupportsReplacement()); |
499 request_url = GURL(search_url.ReplaceSearchTerms(search_string, | 499 request_url = GURL(search_url.ReplaceSearchTerms( |
500 TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, | 500 TemplateURLRef::SearchTermsArgs(search_string))); |
501 string16())); | |
502 } | 501 } |
503 } | 502 } |
504 if (request_url.is_valid()) { | 503 if (request_url.is_valid()) { |
505 browser->OpenURL(OpenURLParams(request_url, Referrer(), NEW_FOREGROUND_TAB, | 504 browser->OpenURL(OpenURLParams(request_url, Referrer(), NEW_FOREGROUND_TAB, |
506 content::PAGE_TRANSITION_TYPED, false)); | 505 content::PAGE_TRANSITION_TYPED, false)); |
507 } | 506 } |
508 } | 507 } |
509 | 508 |
510 void BrowserFrameWin::GetMetroCurrentTabInfo(WPARAM w_param) { | 509 void BrowserFrameWin::GetMetroCurrentTabInfo(WPARAM w_param) { |
511 if (!base::win::IsMetroProcess()) { | 510 if (!base::win::IsMetroProcess()) { |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 | 565 |
567 //////////////////////////////////////////////////////////////////////////////// | 566 //////////////////////////////////////////////////////////////////////////////// |
568 // NativeBrowserFrame, public: | 567 // NativeBrowserFrame, public: |
569 | 568 |
570 // static | 569 // static |
571 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( | 570 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( |
572 BrowserFrame* browser_frame, | 571 BrowserFrame* browser_frame, |
573 BrowserView* browser_view) { | 572 BrowserView* browser_view) { |
574 return new BrowserFrameWin(browser_frame, browser_view); | 573 return new BrowserFrameWin(browser_frame, browser_view); |
575 } | 574 } |
OLD | NEW |