chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm - Issue 12388035: Don't crash when quitting while an extension popup is open.

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/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm

Issue 12388035: Don't crash when quitting while an extension popup is open. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: -hax Created 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"	5 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"

6	6

7 #include "base/file_util.h"	7 #include "base/file_util.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "base/json/json_file_value_serializer.h"	9 #include "base/json/json_file_value_serializer.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

(...skipping 131 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 EXPECT_FALSE([inspectItem isHidden]);	142 EXPECT_FALSE([inspectItem isHidden]);

143	143

144 content::WindowedNotificationObserver devtools_attached_observer(	144 content::WindowedNotificationObserver devtools_attached_observer(

145 content::NOTIFICATION_DEVTOOLS_AGENT_ATTACHED,	145 content::NOTIFICATION_DEVTOOLS_AGENT_ATTACHED,

146 content::NotificationService::AllSources());	146 content::NotificationService::AllSources());

147 [NSApp sendAction:[inspectItem action]	147 [NSApp sendAction:[inspectItem action]

148 to:[inspectItem target]	148 to:[inspectItem target]

149 from:inspectItem];	149 from:inspectItem];

150 devtools_attached_observer.Wait();	150 devtools_attached_observer.Wait();

151	151

152 // Hide the popup to prevent racy crashes at test cleanup.

153 BrowserActionTestUtil test_util(browser());

154 test_util.HidePopup();

155

156 service->SetBoolean(prefs::kExtensionsUIDeveloperMode, original);	152 service->SetBoolean(prefs::kExtensionsUIDeveloperMode, original);

157 }	153 }

OLD	NEW