chrome/browser/extensions/api/commands/command_service_browsertest.cc - Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/

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/api/commands/command_service_browsertest.cc

Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 7 years, 3 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/chromeos/file_manager/zip_file_creator.cc ('k') | chrome/browser/extensions/api/identity/experimental_identity_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/commands/command_service_browsertest.cc

diff --git a/chrome/browser/extensions/api/commands/command_service_browsertest.cc b/chrome/browser/extensions/api/commands/command_service_browsertest.cc

index 21c8f0e5ffae26115b1c3dd8241afd58cf04bea6..2ed81c2db281ae163c60606fe509e63c8441e147 100644

--- a/chrome/browser/extensions/api/commands/command_service_browsertest.cc

+++ b/chrome/browser/extensions/api/commands/command_service_browsertest.cc

@@ -5,9 +5,9 @@

#include "chrome/browser/extensions/api/commands/command_service.h"

#include "chrome/browser/extensions/extension_apitest.h"

#include "chrome/browser/extensions/extension_service.h"

-#include "chrome/common/extensions/extension_manifest_constants.h"

#include "content/public/test/browser_test.h"

#include "content/public/test/test_utils.h"

+#include "extensions/common/manifest_constants.h"

namespace extensions {

@@ -44,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(CommandServiceTest, RemoveShortcutSurvivesUpdate) {

// Verify it has a command of Alt+Shift+F.

ui::Accelerator accelerator =

command_service->FindShortcutForCommand(

- kId, extension_manifest_values::kBrowserActionCommandEvent);

+ kId, manifest_values::kBrowserActionCommandEvent);

EXPECT_EQ(ui::VKEY_F, accelerator.key_code());

EXPECT_FALSE(accelerator.IsCtrlDown());

EXPECT_TRUE(accelerator.IsShiftDown());

@@ -52,11 +52,11 @@ IN_PROC_BROWSER_TEST_F(CommandServiceTest, RemoveShortcutSurvivesUpdate) {

// Remove the keybinding.

command_service->RemoveKeybindingPrefs(

- kId, extension_manifest_values::kBrowserActionCommandEvent);

+ kId, manifest_values::kBrowserActionCommandEvent);

// Verify it got removed.

accelerator = command_service->FindShortcutForCommand(

- kId, extension_manifest_values::kBrowserActionCommandEvent);

+ kId, manifest_values::kBrowserActionCommandEvent);

EXPECT_EQ(ui::VKEY_UNKNOWN, accelerator.key_code());

// Update to version 2.

@@ -65,7 +65,7 @@ IN_PROC_BROWSER_TEST_F(CommandServiceTest, RemoveShortcutSurvivesUpdate) {

// Verify it is still set to nothing.

accelerator = command_service->FindShortcutForCommand(

- kId, extension_manifest_values::kBrowserActionCommandEvent);

+ kId, manifest_values::kBrowserActionCommandEvent);

EXPECT_EQ(ui::VKEY_UNKNOWN, accelerator.key_code());

}