diff options
32 files changed, 92 insertions, 99 deletions
diff --git a/content/browser/accessibility/browser_accessibility.cc b/chrome/browser/accessibility/browser_accessibility.cc index 784bae0..92a4819 100644 --- a/content/browser/accessibility/browser_accessibility.cc +++ b/chrome/browser/accessibility/browser_accessibility.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/browser_accessibility.h" +#include "chrome/browser/accessibility/browser_accessibility.h" #include "base/logging.h" #include "base/string_number_conversions.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) // There's no OS-specific implementation of BrowserAccessibilityManager diff --git a/content/browser/accessibility/browser_accessibility.h b/chrome/browser/accessibility/browser_accessibility.h index dbd3e13..3234372 100644 --- a/content/browser/accessibility/browser_accessibility.h +++ b/chrome/browser/accessibility/browser_accessibility.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_ #pragma once #include <map> @@ -224,4 +224,4 @@ class BrowserAccessibility { DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility); }; -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/chrome/browser/accessibility/browser_accessibility_cocoa.h index ab4044f..db224e0 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.h +++ b/chrome/browser/accessibility/browser_accessibility_cocoa.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COCOA_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COCOA_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COCOA_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COCOA_H_ #pragma once #import <Cocoa/Cocoa.h> #import "base/memory/scoped_nsobject.h" -#import "content/browser/accessibility/browser_accessibility_delegate_mac.h" -#include "content/browser/accessibility/browser_accessibility.h" +#import "chrome/browser/accessibility/browser_accessibility_delegate_mac.h" +#include "chrome/browser/accessibility/browser_accessibility.h" // BrowserAccessibilityCocoa is a cocoa wrapper around the BrowserAccessibility // object. The renderer converts webkit's accessibility tree into a @@ -73,4 +73,4 @@ @property(nonatomic, readonly) id window; @end -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COCOA_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COCOA_H_ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/chrome/browser/accessibility/browser_accessibility_cocoa.mm index 1920493..f4ed2e4 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/chrome/browser/accessibility/browser_accessibility_cocoa.mm @@ -4,14 +4,14 @@ #include <execinfo.h> -#import "content/browser/accessibility/browser_accessibility_cocoa.h" +#import "chrome/browser/accessibility/browser_accessibility_cocoa.h" #include <map> #include "base/string16.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/renderer_host/render_widget_host_view_mac.h" #include "grit/webkit_strings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/content/browser/accessibility/browser_accessibility_delegate_mac.h b/chrome/browser/accessibility/browser_accessibility_delegate_mac.h index 680ab87..1fd27c1 100644 --- a/content/browser/accessibility/browser_accessibility_delegate_mac.h +++ b/chrome/browser/accessibility/browser_accessibility_delegate_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_DELEGATE_MAC_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_DELEGATE_MAC_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_DELEGATE_MAC_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_DELEGATE_MAC_H_ #pragma once @class BrowserAccessibilityCocoa; @@ -21,4 +21,4 @@ - (NSWindow*)window; @end -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_DELEGATE_MAC_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_DELEGATE_MAC_H_ diff --git a/content/browser/accessibility/browser_accessibility_mac.h b/chrome/browser/accessibility/browser_accessibility_mac.h index ee6cfca..027ab94 100644 --- a/content/browser/accessibility/browser_accessibility_mac.h +++ b/chrome/browser/accessibility/browser_accessibility_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MAC_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MAC_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MAC_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MAC_H_ #pragma once #include <map> @@ -11,7 +11,7 @@ #include <vector> #include "base/memory/scoped_nsobject.h" -#include "content/browser/accessibility/browser_accessibility.h" +#include "chrome/browser/accessibility/browser_accessibility.h" @class BrowserAccessibilityCocoa; @@ -43,4 +43,4 @@ class BrowserAccessibilityMac : public BrowserAccessibility { DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityMac); }; -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MAC_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MAC_H_ diff --git a/content/browser/accessibility/browser_accessibility_mac.mm b/chrome/browser/accessibility/browser_accessibility_mac.mm index 145294d..6594c7e 100644 --- a/content/browser/accessibility/browser_accessibility_mac.mm +++ b/chrome/browser/accessibility/browser_accessibility_mac.mm @@ -4,11 +4,12 @@ #import <Cocoa/Cocoa.h> -#import "content/browser/accessibility/browser_accessibility_mac.h" +#import "chrome/browser/accessibility/browser_accessibility_mac.h" -#import "content/browser/accessibility/browser_accessibility_cocoa.h" -#import "content/browser/accessibility/browser_accessibility_delegate_mac.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" +#import "chrome/browser/accessibility/browser_accessibility_cocoa.h" +#import "chrome/browser/accessibility/browser_accessibility_delegate_mac.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" +#import "chrome/browser/renderer_host/render_widget_host_view_mac.h" // Static. @@ -29,8 +30,7 @@ void BrowserAccessibilityMac::Initialize() { // We take ownership of the cocoa obj here. browser_accessibility_cocoa_ = [[BrowserAccessibilityCocoa alloc] initWithObject:this - delegate: - (id<BrowserAccessibilityDelegateCocoa>)manager_->GetParentView()]; + delegate:(RenderWidgetHostViewCocoa*)manager_->GetParentView()]; } void BrowserAccessibilityMac::NativeReleaseReference() { diff --git a/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm b/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm index 595fb33..09fb41f1 100644 --- a/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm +++ b/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm @@ -7,9 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/accessibility/browser_accessibility_cocoa.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "content/browser/accessibility/browser_accessibility_cocoa.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/chrome/browser/accessibility/browser_accessibility_manager.cc index a99c782..4c58228 100644 --- a/content/browser/accessibility/browser_accessibility_manager.cc +++ b/chrome/browser/accessibility/browser_accessibility_manager.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" #include "base/logging.h" -#include "content/browser/accessibility/browser_accessibility.h" +#include "chrome/browser/accessibility/browser_accessibility.h" #include "content/common/view_messages.h" using webkit_glue::WebAccessibility; diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/chrome/browser/accessibility/browser_accessibility_manager.h index bbb7d77..1014f33 100644 --- a/content/browser/accessibility/browser_accessibility_manager.h +++ b/chrome/browser/accessibility/browser_accessibility_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_ #pragma once #include <vector> @@ -174,4 +174,4 @@ class BrowserAccessibilityManager { DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager); }; -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.h b/chrome/browser/accessibility/browser_accessibility_manager_mac.h index c7c5089..dc35d6f 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.h +++ b/chrome/browser/accessibility/browser_accessibility_manager_mac.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_MAC_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_MAC_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_MAC_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_MAC_H_ #pragma once #import <Cocoa/Cocoa.h> -#include "content/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" class BrowserAccessibilityManagerMac : public BrowserAccessibilityManager { public: @@ -28,4 +28,4 @@ class BrowserAccessibilityManagerMac : public BrowserAccessibilityManager { DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManagerMac); }; -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_MAC_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_MAC_H_ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/chrome/browser/accessibility/browser_accessibility_manager_mac.mm index b5618fe3..5c876e3 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/chrome/browser/accessibility/browser_accessibility_manager_mac.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/browser_accessibility_manager_mac.h" +#include "chrome/browser/accessibility/browser_accessibility_manager_mac.h" #import "base/logging.h" -#import "content/browser/accessibility/browser_accessibility_cocoa.h" +#import "chrome/browser/accessibility/browser_accessibility_cocoa.h" #include "content/common/view_messages.h" // static diff --git a/chrome/browser/accessibility/browser_accessibility_manager_unittest.cc b/chrome/browser/accessibility/browser_accessibility_manager_unittest.cc index 79f96b8..4d8bb15 100644 --- a/chrome/browser/accessibility/browser_accessibility_manager_unittest.cc +++ b/chrome/browser/accessibility/browser_accessibility_manager_unittest.cc @@ -4,8 +4,8 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "content/browser/accessibility/browser_accessibility.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/accessibility/browser_accessibility.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" #include "content/common/view_messages.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/webaccessibility.h" diff --git a/content/browser/accessibility/browser_accessibility_manager_win.cc b/chrome/browser/accessibility/browser_accessibility_manager_win.cc index 7b992e7..92a290c 100644 --- a/content/browser/accessibility/browser_accessibility_manager_win.cc +++ b/chrome/browser/accessibility/browser_accessibility_manager_win.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/browser_accessibility_manager_win.h" +#include "chrome/browser/accessibility/browser_accessibility_manager_win.h" -#include "content/browser/accessibility/browser_accessibility_win.h" +#include "chrome/browser/accessibility/browser_accessibility_win.h" #include "content/common/view_messages.h" using webkit_glue::WebAccessibility; diff --git a/content/browser/accessibility/browser_accessibility_manager_win.h b/chrome/browser/accessibility/browser_accessibility_manager_win.h index 04ea53f..59af0a2 100644 --- a/content/browser/accessibility/browser_accessibility_manager_win.h +++ b/chrome/browser/accessibility/browser_accessibility_manager_win.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_WIN_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_WIN_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_WIN_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_WIN_H_ #pragma once #include <oleacc.h> #include "base/win/scoped_comptr.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" #include "webkit/glue/webaccessibility.h" class BrowserAccessibilityWin; @@ -45,4 +45,4 @@ class BrowserAccessibilityManagerWin : public BrowserAccessibilityManager { DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManagerWin); }; -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_WIN_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_WIN_H_ diff --git a/content/browser/accessibility/browser_accessibility_state.cc b/chrome/browser/accessibility/browser_accessibility_state.cc index 45b3a3b..bc818d3 100644 --- a/content/browser/accessibility/browser_accessibility_state.cc +++ b/chrome/browser/accessibility/browser_accessibility_state.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/browser_accessibility_state.h" +#include "chrome/browser/accessibility/browser_accessibility_state.h" #include "base/memory/singleton.h" diff --git a/content/browser/accessibility/browser_accessibility_state.h b/chrome/browser/accessibility/browser_accessibility_state.h index 82cb8a3..710f18a 100644 --- a/content/browser/accessibility/browser_accessibility_state.h +++ b/chrome/browser/accessibility/browser_accessibility_state.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_STATE_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_STATE_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_STATE_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_STATE_H_ #pragma once #include "base/basictypes.h" @@ -37,7 +37,7 @@ class BrowserAccessibilityState { // Called when screen reader client is detected. void OnScreenReaderDetected(); - // Returns true if the browser should be customized for accessibility. + // Returns true if the Chrome browser should be customized for accessibility. bool IsAccessibleBrowser(); private: @@ -50,4 +50,4 @@ class BrowserAccessibilityState { DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityState); }; -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_STATE_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_STATE_H_ diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/chrome/browser/accessibility/browser_accessibility_win.cc index 8cd1566..a543c12 100644 --- a/content/browser/accessibility/browser_accessibility_win.cc +++ b/chrome/browser/accessibility/browser_accessibility_win.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/browser_accessibility_win.h" +#include "chrome/browser/accessibility/browser_accessibility_win.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/browser/accessibility/browser_accessibility_manager_win.h" +#include "chrome/browser/accessibility/browser_accessibility_manager_win.h" #include "net/base/escape.h" using webkit_glue::WebAccessibility; diff --git a/content/browser/accessibility/browser_accessibility_win.h b/chrome/browser/accessibility/browser_accessibility_win.h index fb8e014..78d0ecd 100644 --- a/content/browser/accessibility/browser_accessibility_win.h +++ b/chrome/browser/accessibility/browser_accessibility_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ +#ifndef CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ +#define CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ #pragma once #include <atlbase.h> @@ -12,7 +12,7 @@ #include <vector> -#include "content/browser/accessibility/browser_accessibility.h" +#include "chrome/browser/accessibility/browser_accessibility.h" #include "ia2_api_all.h" // Generated #include "ISimpleDOMDocument.h" // Generated #include "ISimpleDOMNode.h" // Generated @@ -496,4 +496,4 @@ class BrowserAccessibilityWin DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin); }; -#endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ +#endif // CHROME_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ diff --git a/chrome/browser/accessibility/browser_accessibility_win_unittest.cc b/chrome/browser/accessibility/browser_accessibility_win_unittest.cc index f34b11c..66cf70d 100644 --- a/chrome/browser/accessibility/browser_accessibility_win_unittest.cc +++ b/chrome/browser/accessibility/browser_accessibility_win_unittest.cc @@ -4,8 +4,8 @@ #include "base/memory/scoped_ptr.h" #include "base/win/scoped_comptr.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" -#include "content/browser/accessibility/browser_accessibility_win.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/accessibility/browser_accessibility_win.h" #include "content/common/view_messages.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm index 8c212cf..ebb37f5 100644 --- a/chrome/browser/chrome_browser_application_mac.mm +++ b/chrome/browser/chrome_browser_application_mac.mm @@ -10,12 +10,12 @@ #import "base/memory/scoped_nsobject.h" #import "base/sys_string_conversions.h" #import "chrome/app/breakpad_mac.h" +#include "chrome/browser/accessibility/browser_accessibility_state.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/ui/browser_list.h" #import "chrome/browser/ui/cocoa/objc_method_swizzle.h" #import "chrome/browser/ui/cocoa/objc_zombie.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/accessibility/browser_accessibility_state.h" #include "content/browser/renderer_host/render_view_host.h" // The implementation of NSExceptions break various assumptions in the diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index f491b14..8d72958 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "chrome/app/breakpad_mac.h" +#include "chrome/browser/accessibility/browser_accessibility_state.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/chrome_plugin_message_filter.h" @@ -139,6 +140,9 @@ void ChromeContentBrowserClient::RenderViewHostCreated( new DevToolsHandler(render_view_host); new ExtensionMessageHandler(render_view_host); + if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) + render_view_host->EnableRendererAccessibility(); + InitRenderViewHostForExtensions(render_view_host); } diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h index 1d032e7..923e401 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.h +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h @@ -12,9 +12,9 @@ #include "base/memory/scoped_ptr.h" #include "base/task.h" #include "base/time.h" +#include "chrome/browser/accessibility/browser_accessibility_delegate_mac.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" #include "chrome/browser/ui/cocoa/base_view.h" -#include "content/browser/accessibility/browser_accessibility_delegate_mac.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/renderer_host/accelerated_surface_container_manager_mac.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/common/edit_command.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 64aa8c0..b344f08 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -16,6 +16,7 @@ #include "base/sys_info.h" #include "base/sys_string_conversions.h" #import "chrome/app/breakpad_mac.h" +#import "chrome/browser/accessibility/browser_accessibility_cocoa.h" #include "chrome/browser/browser_trial.h" #import "chrome/browser/renderer_host/accelerated_plugin_view_mac.h" #import "chrome/browser/renderer_host/text_input_client_mac.h" @@ -24,7 +25,6 @@ #import "chrome/browser/ui/cocoa/view_id_util.h" #include "chrome/common/render_messages.h" #include "chrome/common/spellcheck_messages.h" -#import "content/browser/accessibility/browser_accessibility_cocoa.h" #include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/gpu/gpu_process_host_ui_shim.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index fdb5d85..fc28ed1 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -14,14 +14,14 @@ #include "base/win/scoped_comptr.h" #include "base/win/scoped_gdi_object.h" #include "base/win/wrapped_window_proc.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/accessibility/browser_accessibility_state.h" +#include "chrome/browser/accessibility/browser_accessibility_win.h" #include "chrome/browser/browser_trial.h" #include "chrome/browser/renderer_host/render_widget_host_view_views.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" -#include "content/browser/accessibility/browser_accessibility_state.h" -#include "content/browser/accessibility/browser_accessibility_win.h" #include "content/browser/browser_thread.h" #include "content/browser/plugin_process_host.h" #include "content/browser/renderer_host/backing_store.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h index 70e126c..b72d853 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.h +++ b/chrome/browser/renderer_host/render_widget_host_view_win.h @@ -17,7 +17,7 @@ #include "base/memory/scoped_vector.h" #include "base/task.h" #include "base/win/scoped_comptr.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" +#include "chrome/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index 2b344c6..e3f5cdc 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -9,10 +9,10 @@ #include <set> +#include "chrome/browser/accessibility/browser_accessibility_state.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/views/frame/browser_frame_views.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "content/browser/accessibility/browser_accessibility_state.h" #include "grit/theme_resources.h" #include "ui/base/theme_provider.h" #include "ui/gfx/font.h" @@ -221,3 +221,4 @@ NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( return new BrowserFrameViews(browser_frame, browser_view); return new BrowserFrameWin(browser_frame, browser_view); } + diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index d9c1958..c9908f4 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -7,6 +7,7 @@ #include "base/i18n/number_formatting.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/accessibility/browser_accessibility_state.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -18,7 +19,6 @@ #include "chrome/browser/ui/views/wrench_menu.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/common/pref_names.h" -#include "content/browser/accessibility/browser_accessibility_state.h" #include "content/browser/user_metrics.h" #include "content/common/notification_service.h" #include "grit/chromium_strings.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 817eaef..2d85a16 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -75,6 +75,23 @@ # mocks. 'browser/about_flags.cc', 'browser/about_flags.h', + 'browser/accessibility/browser_accessibility.cc', + 'browser/accessibility/browser_accessibility.h', + 'browser/accessibility/browser_accessibility_cocoa.h', + 'browser/accessibility/browser_accessibility_cocoa.mm', + 'browser/accessibility/browser_accessibility_delegate_mac.h', + 'browser/accessibility/browser_accessibility_mac.h', + 'browser/accessibility/browser_accessibility_mac.mm', + 'browser/accessibility/browser_accessibility_manager.cc', + 'browser/accessibility/browser_accessibility_manager.h', + 'browser/accessibility/browser_accessibility_manager_mac.h', + 'browser/accessibility/browser_accessibility_manager_mac.mm', + 'browser/accessibility/browser_accessibility_manager_win.cc', + 'browser/accessibility/browser_accessibility_manager_win.h', + 'browser/accessibility/browser_accessibility_state.cc', + 'browser/accessibility/browser_accessibility_state.h', + 'browser/accessibility/browser_accessibility_win.cc', + 'browser/accessibility/browser_accessibility_win.h', 'browser/accessibility_events.cc', 'browser/accessibility_events.h', 'browser/aeropeek_manager.cc', diff --git a/content/browser/accessibility/OWNERS b/content/browser/accessibility/OWNERS deleted file mode 100644 index ab8afa4..0000000 --- a/content/browser/accessibility/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -ctguil@chromium.org -dmazzoni@chromium.org -dtseng@chromium.org diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc index b962f6e..1f98484 100644 --- a/content/browser/renderer_host/render_widget_host.cc +++ b/content/browser/renderer_host/render_widget_host.cc @@ -11,7 +11,6 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/utf_string_conversions.h" -#include "content/browser/accessibility/browser_accessibility_state.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/backing_store_manager.h" @@ -91,8 +90,7 @@ RenderWidgetHost::RenderWidgetHost(RenderProcessHost* process, process_->WidgetRestored(); if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kForceRendererAccessibility) || - BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) { + switches::kForceRendererAccessibility)) { EnableRendererAccessibility(); } } diff --git a/content/content_browser.gypi b/content/content_browser.gypi index ec460e2..e41827f 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -20,29 +20,11 @@ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/zlib/zlib.gyp:zlib', '../ui/ui.gyp:ui_base', - '../webkit/support/webkit_support.gyp:webkit_resources', ], 'include_dirs': [ '..', ], 'sources': [ - 'browser/accessibility/browser_accessibility.cc', - 'browser/accessibility/browser_accessibility.h', - 'browser/accessibility/browser_accessibility_cocoa.h', - 'browser/accessibility/browser_accessibility_cocoa.mm', - 'browser/accessibility/browser_accessibility_delegate_mac.h', - 'browser/accessibility/browser_accessibility_mac.h', - 'browser/accessibility/browser_accessibility_mac.mm', - 'browser/accessibility/browser_accessibility_manager.cc', - 'browser/accessibility/browser_accessibility_manager.h', - 'browser/accessibility/browser_accessibility_manager_mac.h', - 'browser/accessibility/browser_accessibility_manager_mac.mm', - 'browser/accessibility/browser_accessibility_manager_win.cc', - 'browser/accessibility/browser_accessibility_manager_win.h', - 'browser/accessibility/browser_accessibility_state.cc', - 'browser/accessibility/browser_accessibility_state.h', - 'browser/accessibility/browser_accessibility_win.cc', - 'browser/accessibility/browser_accessibility_win.h', 'browser/appcache/appcache_dispatcher_host.cc', 'browser/appcache/appcache_dispatcher_host.h', 'browser/appcache/appcache_frontend_proxy.cc', @@ -440,12 +422,6 @@ 'browser/renderer_host/p2p/socket_dispatcher_host.h', ], }], - ['OS=="win"', { - 'dependencies': [ - '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', - '../third_party/isimpledom/isimpledom.gyp:isimpledom', - ] - }], ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:dbus-glib', |