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

Unified Diff: chrome/browser/ui/browser.cc

Issue 8118012: WebUI Edit Search Engine Dialog (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: reverse button-strip children in views Created 9 years, 2 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
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f83aaa923e3fcd9afc2165d6976a2800c2ede6aa..a6b73224142e4862df7860740e233e7928ad298c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -113,6 +113,7 @@
#include "chrome/browser/ui/tabs/tab_menu_model.h"
#include "chrome/browser/ui/web_applications/web_app_ui.h"
#include "chrome/browser/ui/webui/bug_report_ui.h"
+#include "chrome/browser/ui/webui/chrome_web_ui.h"
#include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
#include "chrome/browser/ui/webui/options/content_settings_handler.h"
#include "chrome/browser/ui/window_sizer.h"
@@ -3922,7 +3923,15 @@ void Browser::ConfirmSetDefaultSearchProvider(
void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url,
Profile* profile) {
- window()->ConfirmAddSearchProvider(template_url, profile);
+ // If we are using web UI dialogs, then redirect this dialog to the web UI
+ // version. Otherwise, call the existing framework, which is called by way of
+ // window()->ConfirmAddSearchProvider.
+ if (ChromeWebUI::IsMoreWebUI()) {
+ // Call a clean API to confirm adding a search provider.
+ browser::ConfirmAddSearchProvider(template_url, profile);
+ } else {
+ window()->ConfirmAddSearchProvider(template_url, profile);
+ }
}
///////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698