summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/views')
-rw-r--r--chrome/browser/ui/views/first_run_search_engine_view.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc
index 20426a9..58f8beb 100644
--- a/chrome/browser/ui/views/first_run_search_engine_view.cc
+++ b/chrome/browser/ui/views/first_run_search_engine_view.cc
@@ -12,6 +12,7 @@
#include "base/rand_util.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/first_run/first_run_dialog.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/search_engine_type.h"
@@ -57,8 +58,10 @@ void ShowFirstRunDialog(Profile* profile,
// If the default search is managed via policy, we don't ask the user to
// choose.
TemplateURLModel* model = profile->GetTemplateURLModel();
- if (NULL == model || model->is_default_search_managed())
+ if (FirstRun::SearchEngineSelectorDisallowed() || !model ||
+ model->is_default_search_managed()) {
return;
+ }
views::Window* window = views::Window::CreateChromeWindow(
NULL,