diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 22:38:52 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 22:38:52 +0000 |
| commit | 965c7661846b63bc5cbe329b689ef406fd341a86 (patch) | |
| tree | ddcbd4b64a6b67e14e94a1f533f7c1eb8073e1c4 /chrome/browser/views/frame | |
| parent | 1e5c78c698039ab93e989f8b1e78c00e7ae5206c (diff) | |
| download | chromium_src-965c7661846b63bc5cbe329b689ef406fd341a86.zip chromium_src-965c7661846b63bc5cbe329b689ef406fd341a86.tar.gz chromium_src-965c7661846b63bc5cbe329b689ef406fd341a86.tar.bz2 | |
Add the Windows dialog for setting default search provider from js.
Document with the dialog: http://sites.google.com/a/chromium.org/dev/developers/design-documents/chromium-search-provider-js-support
BUG=38475
TEST=Used a custom html page which calls window.external.AddSearchProvider(url, true).
Review URL: http://codereview.chromium.org/3673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_view.h | 6 |
2 files changed, 18 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 4623db2..b0f183a 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -42,6 +42,7 @@ #include "chrome/browser/views/accessible_view_helper.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/browser/views/browser_dialogs.h" +#include "chrome/browser/views/default_search_view.h" #include "chrome/browser/views/download_shelf_view.h" #include "chrome/browser/views/frame/browser_view_layout.h" #include "chrome/browser/views/frame/contents_container.h" @@ -1039,6 +1040,18 @@ void BrowserView::DisableInactiveFrame() { #endif // No tricks are needed to get the right behavior on Linux. } +void BrowserView::ConfirmSetDefaultSearchProvider( + TabContents* tab_contents, + TemplateURL* template_url, + TemplateURLModel* template_url_model) { +#if defined(OS_WIN) + DefaultSearchView::Show(tab_contents, template_url, template_url_model); +#else + // TODO(levin): Implement for other platforms. Right now this is behind + // a command line flag which is off. +#endif +} + void BrowserView::ConfirmAddSearchProvider(const TemplateURL* template_url, Profile* profile) { browser::EditSearchEngine(GetWindow()->GetNativeWindow(), template_url, NULL, diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h index 71e99e3..7c0a13b 100644 --- a/chrome/browser/views/frame/browser_view.h +++ b/chrome/browser/views/frame/browser_view.h @@ -280,8 +280,12 @@ class BrowserView : public BrowserBubbleHost, virtual bool IsToolbarVisible() const; virtual gfx::Rect GetRootWindowResizerRect() const; virtual void DisableInactiveFrame(); + virtual void ConfirmSetDefaultSearchProvider( + TabContents* tab_contents, + TemplateURL* template_url, + TemplateURLModel* template_url_model); virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, - Profile* profile); + Profile* profile); virtual void ToggleBookmarkBar(); virtual views::Window* ShowAboutChromeDialog(); virtual void ShowUpdateChromeDialog(); |