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

Side by Side Diff: chrome/test/data/webui/webui_resource_browsertest.cc

Issue 485343004: Fix bookmark manager regression by allowing cr.ui.Menu#findMenuItem_ to return null. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: arv@ review Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/data/webui/menu_test.html ('k') | ui/webui/resources/js/cr/ui/menu.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <vector> 5 #include <vector>
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SINGLE_SELECTION_MODEL); 104 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SINGLE_SELECTION_MODEL);
105 RunTest(base::FilePath(FILE_PATH_LITERAL( 105 RunTest(base::FilePath(FILE_PATH_LITERAL(
106 "list_single_selection_model_test.html"))); 106 "list_single_selection_model_test.html")));
107 } 107 }
108 108
109 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LocalStringsTest) { 109 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LocalStringsTest) {
110 AddLibrary(IDR_WEBUI_JS_LOCAL_STRINGS); 110 AddLibrary(IDR_WEBUI_JS_LOCAL_STRINGS);
111 RunTest(base::FilePath(FILE_PATH_LITERAL("local_strings_test.html"))); 111 RunTest(base::FilePath(FILE_PATH_LITERAL("local_strings_test.html")));
112 } 112 }
113 113
114 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MenuTest) {
115 AddLibrary(IDR_WEBUI_JS_ASSERT);
116 AddLibrary(IDR_WEBUI_JS_CR);
117 AddLibrary(IDR_WEBUI_JS_CR_UI);
118 AddLibrary(IDR_WEBUI_JS_CR_UI_COMMAND);
119 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_ITEM);
120 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU);
121 RunTest(base::FilePath(FILE_PATH_LITERAL("menu_test.html")));
122 }
123
114 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MockTimerTest) { 124 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MockTimerTest) {
115 RunTest(base::FilePath(FILE_PATH_LITERAL("mock_timer_test.html"))); 125 RunTest(base::FilePath(FILE_PATH_LITERAL("mock_timer_test.html")));
116 } 126 }
117 127
118 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ParseHtmlSubsetTest) { 128 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ParseHtmlSubsetTest) {
119 AddLibrary(IDR_WEBUI_JS_PARSE_HTML_SUBSET); 129 AddLibrary(IDR_WEBUI_JS_PARSE_HTML_SUBSET);
120 RunTest(base::FilePath(FILE_PATH_LITERAL("parse_html_subset_test.html"))); 130 RunTest(base::FilePath(FILE_PATH_LITERAL("parse_html_subset_test.html")));
121 } 131 }
122 132
123 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PositionUtilTest) { 133 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PositionUtilTest) {
124 AddLibrary(IDR_WEBUI_JS_CR); 134 AddLibrary(IDR_WEBUI_JS_CR);
125 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL); 135 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL);
126 RunTest(base::FilePath(FILE_PATH_LITERAL("position_util_test.html"))); 136 RunTest(base::FilePath(FILE_PATH_LITERAL("position_util_test.html")));
127 } 137 }
128 138
129 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, RepeatingButtonTest) { 139 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, RepeatingButtonTest) {
130 AddLibrary(IDR_WEBUI_JS_CR); 140 AddLibrary(IDR_WEBUI_JS_CR);
131 AddLibrary(IDR_WEBUI_JS_CR_UI); 141 AddLibrary(IDR_WEBUI_JS_CR_UI);
132 AddLibrary(IDR_WEBUI_JS_CR_UI_REPEATING_BUTTON); 142 AddLibrary(IDR_WEBUI_JS_CR_UI_REPEATING_BUTTON);
133 RunTest(base::FilePath(FILE_PATH_LITERAL("repeating_button_test.html"))); 143 RunTest(base::FilePath(FILE_PATH_LITERAL("repeating_button_test.html")));
134 } 144 }
OLDNEW
« no previous file with comments | « chrome/test/data/webui/menu_test.html ('k') | ui/webui/resources/js/cr/ui/menu.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698