DevTools: Merge SearchView into AdvancedSearchController

R=pfeldman, vsevik

Review URL: https://codereview.chromium.org/236683004

git-svn-id: svn://svn.chromium.org/blink/trunk@171472 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/inspector/editor/text-editor-selection-to-search.html

@@ -23,8 +23,16 @@ function test()
     {
         panel.searchableView().showSearchField();
         InspectorTest.addResult("Search controller: '" + panel.searchableView()._searchInputElement.value + "'");
-        WebInspector.advancedSearchController.show();
-        InspectorTest.addResult("Advanced search controller: '" + WebInspector.advancedSearchController._searchView._search.value + "'");
+        var extensions = WebInspector.moduleManager.extensions("drawer-view");
+        var searchView;
+        for (var i = 0; i < extensions.length; ++i) {
+            if (extensions[i].descriptor()["name"] === "search") {
+                searchView = extensions[i].instance();
+                break;
+            }
+        }
+        searchView.toggle();
+        InspectorTest.addResult("Advanced search controller: '" + searchView._search.value + "'");
         InspectorTest.completeTest();
     }
 

third_party/WebKit/Source/devtools/devtools.gyp

@@ -177,7 +177,7 @@
                         'input_pages': [
                             '<(PRODUCT_DIR)/resources/inspector/devtools.html',
                             '<(PRODUCT_DIR)/resources/inspector/Main.js',
-                            '<(PRODUCT_DIR)/resources/inspector/AdvancedSearchController.js',
+                            '<(PRODUCT_DIR)/resources/inspector/AdvancedSearchView.js',
                             '<(PRODUCT_DIR)/resources/inspector/ConsolePanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/ElementsPanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/ExtensionServer.js',
@@ -347,13 +347,13 @@
                     'actions': [{
                         'action_name': 'concatenate_devtools_search_js',
                         'script_name': 'scripts/inline_js_imports.py',
-                        'input_file': 'front_end/AdvancedSearchController.js',
+                        'input_file': 'front_end/AdvancedSearchView.js',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(devtools_search_js_files)',
                         ],
                         'search_path': 'front_end',
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/AdvancedSearchController.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/AdvancedSearchView.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_search_path)', '<@(_outputs)'],
                     }],
                 },

third_party/WebKit/Source/devtools/devtools.gypi

@@ -243,7 +243,7 @@
             'front_end/ConsoleViewMessage.js',
         ],
         'devtools_search_js_files': [
-            'front_end/AdvancedSearchController.js',
+            'front_end/AdvancedSearchView.js',
             'front_end/FileBasedSearchResultsPane.js',
             'front_end/SearchConfig.js',
             'front_end/SourcesSearchScope.js',

third_party/WebKit/Source/devtools/front_end/modules.js

@@ -534,7 +534,7 @@ var allDescriptors = [
                  name: "search",
                  title: "Search",
                  order: "1",
-                 className: "WebInspector.SearchView"
+                 className: "WebInspector.AdvancedSearchView"
              },
              {
                  type: "@WebInspector.ActionDelegate",
@@ -548,10 +548,10 @@ var allDescriptors = [
                          shortcut: "Ctrl+Shift+F"
                      }
                  ],
-                 className: "WebInspector.AdvancedSearchController.ToggleDrawerViewActionDelegate"
+                 className: "WebInspector.AdvancedSearchView.ToggleDrawerViewActionDelegate"
              }
         ],
-        scripts: [ "AdvancedSearchController.js" ]
+        scripts: [ "AdvancedSearchView.js" ]
     },
     {
         name: "settings",

third_party/WebKit/Source/devtools/scripts/compile_frontend.py

@@ -68,7 +68,7 @@ except:
 # the module header list.
 allowed_import_statements_files = [
     "utilities.js",
-    "AdvancedSearchController.js",
+    "AdvancedSearchView.js",
     "ConsolePanel.js",
     "ElementsPanel.js",
     "ResourcesPanel.js",

third_party/WebKit/Source/devtools/scripts/frontend_modules.json

@@ -262,7 +262,7 @@
         "name": "search",
         "dependencies": ["components"],
         "sources": [
-            "AdvancedSearchController.js",
+            "AdvancedSearchView.js",
             "FileBasedSearchResultsPane.js",
             "SearchConfig.js",
             "SourcesSearchScope.js"