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

Side by Side Diff: chrome/browser/accessibility/browser_views_accessibility_browsertest.cc

Issue 10399084: Fix crash in the accessibility code in the shared build. The problem is that the ATL module pointer… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update license header in atl_module.h Created 8 years, 7 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
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 <oleacc.h> 5 #include <oleacc.h>
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "base/win/atl_module.h"
8 #include "base/win/scoped_comptr.h" 9 #include "base/win/scoped_comptr.h"
9 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/view_ids.h" 12 #include "chrome/browser/ui/view_ids.h"
12 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 13 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
13 #include "chrome/browser/ui/views/frame/browser_view.h" 14 #include "chrome/browser/ui/views/frame/browser_view.h"
14 #include "chrome/browser/ui/views/toolbar_view.h" 15 #include "chrome/browser/ui/views/toolbar_view.h"
15 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
16 #include "chrome/test/base/in_process_browser_test.h" 17 #include "chrome/test/base/in_process_browser_test.h"
17 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
18 #include "grit/chromium_strings.h" 19 #include "grit/chromium_strings.h"
19 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
20 #include "ui/base/accessibility/accessibility_types.h" 21 #include "ui/base/accessibility/accessibility_types.h"
21 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
22 #include "ui/base/win/atl_module.h"
23 #include "ui/views/accessibility/native_view_accessibility_win.h" 23 #include "ui/views/accessibility/native_view_accessibility_win.h"
24 #include "ui/views/widget/widget.h" 24 #include "ui/views/widget/widget.h"
25 25
26 namespace { 26 namespace {
27 27
28 VARIANT id_self = {VT_I4, CHILDID_SELF}; 28 VARIANT id_self = {VT_I4, CHILDID_SELF};
29 29
30 } // namespace 30 } // namespace
31 31
32 class BrowserViewsAccessibilityTest : public InProcessBrowserTest { 32 class BrowserViewsAccessibilityTest : public InProcessBrowserTest {
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 ASSERT_EQ(S_OK, hr); 278 ASSERT_EQ(S_OK, hr);
279 ASSERT_TRUE(NULL != acc_obj); 279 ASSERT_TRUE(NULL != acc_obj);
280 280
281 TestAccessibilityInfo( 281 TestAccessibilityInfo(
282 acc_obj, 282 acc_obj,
283 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)), 283 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)),
284 ROLE_SYSTEM_DIALOG); 284 ROLE_SYSTEM_DIALOG);
285 285
286 acc_obj->Release(); 286 acc_obj->Release();
287 } 287 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698