chrome/browser/extensions/extension_context_menu_browsertest.cc - Issue 4710001: Split out command IDs from chrome_dll_resource.h.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/extension_context_menu_browsertest.cc

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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

« chrome/app/chrome_dll_resource.h ('K') | « chrome/browser/encoding_menu_controller_unittest.cc ('k') | chrome/browser/external_tab_container_win.cc » ('j') | chrome/chrome_exe.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "app/menus/menu_model.h"	5 #include "app/menus/menu_model.h"

6 #include "chrome/app/chrome_dll_resource.h"	6 #include "chrome/app/chrome_command_ids.h"

7 #include "chrome/browser/browser.h"	7 #include "chrome/browser/browser.h"

8 #include "chrome/browser/browser_list.h"	8 #include "chrome/browser/browser_list.h"

9 #include "chrome/browser/extensions/extension_browsertest.h"	9 #include "chrome/browser/extensions/extension_browsertest.h"

10 #include "chrome/browser/extensions/extension_test_message_listener.h"	10 #include "chrome/browser/extensions/extension_test_message_listener.h"

11 #include "chrome/browser/extensions/extensions_service.h"	11 #include "chrome/browser/extensions/extensions_service.h"

12 #include "chrome/browser/profile.h"	12 #include "chrome/browser/profile.h"

13 #include "chrome/browser/tab_contents/render_view_context_menu.h"	13 #include "chrome/browser/tab_contents/render_view_context_menu.h"

14 #include "chrome/browser/tab_contents/tab_contents.h"	14 #include "chrome/browser/tab_contents/tab_contents.h"

15 #include "chrome/common/chrome_switches.h"	15 #include "chrome/common/chrome_switches.h"

16 #include "chrome/test/ui_test_utils.h"	16 #include "chrome/test/ui_test_utils.h"

(...skipping 403 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
420 // Wait for the extension's script to tell us its onclick fired. Ensure	420 // Wait for the extension's script to tell us its onclick fired. Ensure

421 // that the incognito version doesn't fire until we explicitly click the	421 // that the incognito version doesn't fire until we explicitly click the

422 // incognito menu item.	422 // incognito menu item.

423 ASSERT_TRUE(onclick.WaitUntilSatisfied());	423 ASSERT_TRUE(onclick.WaitUntilSatisfied());

424 EXPECT_FALSE(onclick_incognito.was_satisfied());	424 EXPECT_FALSE(onclick_incognito.was_satisfied());

425	425

426 ASSERT_TRUE(menu_incognito->IsCommandIdEnabled(command_id));	426 ASSERT_TRUE(menu_incognito->IsCommandIdEnabled(command_id));

427 menu_incognito->ExecuteCommand(command_id);	427 menu_incognito->ExecuteCommand(command_id);

428 ASSERT_TRUE(onclick_incognito.WaitUntilSatisfied());	428 ASSERT_TRUE(onclick_incognito.WaitUntilSatisfied());

429 }	429 }

OLD	NEW