chrome/browser/extensions/extension_keybinding_apitest.cc - Issue 183883033: Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_keybinding_apitest.cc

Issue 183883033: Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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

« no previous file with comments | « chrome/browser/extensions/api/commands/command_service.cc ('k') | chrome/browser/ui/omnibox/location_bar.cc » ('j') | chrome/browser/ui/omnibox/location_bar.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_keybinding_apitest.cc

diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc

index 49fae8680370495ea2595212a407b159d01a6a81..f27477750262d228de2c3ed43ba3c1afcd4d1b3b 100644

--- a/chrome/browser/extensions/extension_keybinding_apitest.cc

+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc

@@ -241,17 +241,9 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_DontOverwriteSystemShortcuts) {

ASSERT_TRUE(result);

}

-#if defined(OS_WIN)

-// TODO(wittman): Enable the test once the bookmarks aren't a part of Settings

-// Overrides API.

-#define MAYBE_OverwriteBookmarkShortcut OverwriteBookmarkShortcut

-#else

-#define MAYBE_OverwriteBookmarkShortcut DISABLED_OverwriteBookmarkShortcut

-#endif

// This test validates that an extension can override the Chrome bookmark

// shortcut if it has requested to do so.

-IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_OverwriteBookmarkShortcut) {

+IN_PROC_BROWSER_TEST_F(CommandsApiTest, OverwriteBookmarkShortcut) {

ASSERT_TRUE(test_server()->Start());

ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));