From 4b1ab4dc3298e616f39ede8beca82b8dcae41637 Mon Sep 17 00:00:00 2001 From: "finnur@chromium.org" Date: Mon, 10 Mar 2014 12:59:02 +0000 Subject: [PATCH] Show the full extension information in the extension controlled setting bubble for Default search engines. Also fix the glitch where the bubble popping up from the Default Search Engine list (DSE) appearing behind a selected row in the Other Search Engine list (OSE). That is fixed by making the OSE list have a lower z-index within the stacking context than the DSE. BUG=314507 R=dbeam@chromium.org Review URL: https://codereview.chromium.org/181293005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255931 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/options/search_engine_manager.css | 8 ++++++++ .../resources/options/search_engine_manager_engine_list.js | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/chrome/browser/resources/options/search_engine_manager.css b/chrome/browser/resources/options/search_engine_manager.css index c19734da4e40..68ad445ab7fc 100644 --- a/chrome/browser/resources/options/search_engine_manager.css +++ b/chrome/browser/resources/options/search_engine_manager.css @@ -78,4 +78,12 @@ display: none; } +#default-search-engine-list { + z-index: 2; +} + +#other-search-engine-list { + z-index: 1; +} + /* End temporary Make Default button styling */ diff --git a/chrome/browser/resources/options/search_engine_manager_engine_list.js b/chrome/browser/resources/options/search_engine_manager_engine_list.js index 9bc12b9f8b61..0be060294d4f 100644 --- a/chrome/browser/resources/options/search_engine_manager_engine_list.js +++ b/chrome/browser/resources/options/search_engine_manager_engine_list.js @@ -186,9 +186,8 @@ cr.define('options.search_engines', function() { // CoreOptionsHandler::CreateValueForPref() does. var event = new Event(this.contentType); if (engine.extension) { - event.value = { controlledBy: 'extension' }; - // TODO(mad): add id, name, and icon once we solved the issue with the - // search engine manager in http://crbug.com/314507. + event.value = { controlledBy: 'extension', + extension: engine.extension }; } else { event.value = { controlledBy: 'policy' }; } -- 2.11.4.GIT