| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/scoped_comptr.h" | 8 #include "base/win/scoped_comptr.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 BrowserWindow* browser_window = browser()->window(); | 48 BrowserWindow* browser_window = browser()->window(); |
| 49 | 49 |
| 50 if (!browser_window) | 50 if (!browser_window) |
| 51 return NULL; | 51 return NULL; |
| 52 | 52 |
| 53 return browser_window->GetBrowserWindowTesting(); | 53 return browser_window->GetBrowserWindowTesting(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 // Retrieve an instance of BrowserView | 56 // Retrieve an instance of BrowserView |
| 57 BrowserView* GetBrowserView() { | 57 BrowserView* GetBrowserView() { |
| 58 return BrowserView::GetBrowserViewForNativeWindow( | 58 return BrowserView::GetBrowserViewForBrowser(browser()); |
| 59 browser()->window()->GetNativeHandle()); | |
| 60 } | 59 } |
| 61 | 60 |
| 62 // Retrieves and initializes an instance of ToolbarView. | 61 // Retrieves and initializes an instance of ToolbarView. |
| 63 ToolbarView* GetToolbarView() { | 62 ToolbarView* GetToolbarView() { |
| 64 BrowserWindowTesting* browser_window_testing = GetBrowserWindowTesting(); | 63 BrowserWindowTesting* browser_window_testing = GetBrowserWindowTesting(); |
| 65 | 64 |
| 66 if (!browser_window_testing) | 65 if (!browser_window_testing) |
| 67 return NULL; | 66 return NULL; |
| 68 | 67 |
| 69 return browser_window_testing->GetToolbarView(); | 68 return browser_window_testing->GetToolbarView(); |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 ASSERT_EQ(S_OK, hr); | 262 ASSERT_EQ(S_OK, hr); |
| 264 ASSERT_TRUE(NULL != acc_obj); | 263 ASSERT_TRUE(NULL != acc_obj); |
| 265 | 264 |
| 266 TestAccessibilityInfo( | 265 TestAccessibilityInfo( |
| 267 acc_obj, | 266 acc_obj, |
| 268 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)), | 267 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)), |
| 269 ROLE_SYSTEM_DIALOG); | 268 ROLE_SYSTEM_DIALOG); |
| 270 | 269 |
| 271 acc_obj->Release(); | 270 acc_obj->Release(); |
| 272 } | 271 } |
| OLD | NEW |