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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm

Issue 11308053: Merge 167819 - Fix crash when programatically closing media gallery dialog (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 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
OLDNEW
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 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h" 5 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h"
6 6
7 #include "chrome/browser/media_gallery/media_galleries_dialog_controller_mock.h" 7 #include "chrome/browser/media_gallery/media_galleries_dialog_controller_mock.h"
8 #include "chrome/browser/ui/browser_tabstrip.h" 8 #include "chrome/browser/ui/browser_tabstrip.h"
9 #include "chrome/browser/ui/constrained_window_tab_helper.h" 9 #include "chrome/browser/ui/constrained_window_tab_helper.h"
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
(...skipping 28 matching lines...) Expand all
39 scoped_nsobject<NSWindow> window([[dialog->alert_ window] retain]); 39 scoped_nsobject<NSWindow> window([[dialog->alert_ window] retain]);
40 EXPECT_TRUE([window isVisible]); 40 EXPECT_TRUE([window isVisible]);
41 41
42 ConstrainedWindowTabHelper* constrained_window_tab_helper = 42 ConstrainedWindowTabHelper* constrained_window_tab_helper =
43 ConstrainedWindowTabHelper::FromWebContents(web_contents); 43 ConstrainedWindowTabHelper::FromWebContents(web_contents);
44 constrained_window_tab_helper->CloseConstrainedWindows(); 44 constrained_window_tab_helper->CloseConstrainedWindows();
45 EXPECT_FALSE([window isVisible]); 45 EXPECT_FALSE([window isVisible]);
46 } 46 }
47 47
48 } // namespace chrome 48 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698