diff options
| -rw-r--r-- | chrome/browser/DEPS | 3 | ||||
| -rw-r--r-- | chrome/browser/accessibility/accessibility_win_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/chrome_frame_ui_test_utils.cc | 2 | ||||
| -rw-r--r-- | content/browser/DEPS | 3 | ||||
| -rw-r--r-- | content/browser/accessibility/browser_accessibility_win.h | 8 | ||||
| -rw-r--r-- | third_party/iaccessible2/iaccessible2.gyp | 27 |
6 files changed, 23 insertions, 22 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 3288759..2ebbf56 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -32,10 +32,11 @@ include_rules = [ "+third_party/apple", # Apple code ImageAndTextCell. "+third_party/cld", "+third_party/expat", - "+third_party/sqlite", + "+third_party/iaccessible2", "+third_party/libevent", # For the remote V8 debugging server "+third_party/libjingle", "+third_party/protobuf/src/google/protobuf", + "+third_party/sqlite", "+third_party/undoview", "+v8/include", # Browser uses V8 to get the version and run the debugger. diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc index b844811..c15223d 100644 --- a/chrome/browser/accessibility/accessibility_win_browsertest.cc +++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc @@ -18,7 +18,7 @@ #include "content/browser/renderer_host/render_widget_host_view_win.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/content_notification_types.h" -#include "ia2_api_all.h" // Generated NOLINT +#include "third_party/iaccessible2/ia2_api_all.h" #include "ISimpleDOMNode.h" // Generated NOLINT using std::auto_ptr; diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.cc b/chrome_frame/test/chrome_frame_ui_test_utils.cc index d1dbd67..80a7ead 100644 --- a/chrome_frame/test/chrome_frame_ui_test_utils.cc +++ b/chrome_frame/test/chrome_frame_ui_test_utils.cc @@ -19,8 +19,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome_frame/test/win_event_receiver.h" #include "chrome_frame/utils.h" -#include "ia2_api_all.h" // Generated NOLINT #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/iaccessible2/ia2_api_all.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/content/browser/DEPS b/content/browser/DEPS index 4794649..525e540 100644 --- a/content/browser/DEPS +++ b/content/browser/DEPS @@ -1,6 +1,9 @@ include_rules = [ "+content/gpu", # For gpu_info_collector.h and in-process GPU + # Other libraries. + "+third_party/iaccessible2", + # DO NOT ADD ANY CHROME INCLUDES HERE!!! # See https://sites.google.com/a/chromium.org/dev/developers/content-module # for more information. diff --git a/content/browser/accessibility/browser_accessibility_win.h b/content/browser/accessibility/browser_accessibility_win.h index fbcc942..2e6e951 100644 --- a/content/browser/accessibility/browser_accessibility_win.h +++ b/content/browser/accessibility/browser_accessibility_win.h @@ -13,10 +13,10 @@ #include <vector> #include "content/browser/accessibility/browser_accessibility.h" -#include "ia2_api_all.h" // Generated -#include "ISimpleDOMDocument.h" // Generated -#include "ISimpleDOMNode.h" // Generated -#include "ISimpleDOMText.h" // Generated +#include "ISimpleDOMDocument.h" // Generated NOLINT +#include "ISimpleDOMNode.h" // Generated NOLINT +#include "ISimpleDOMText.h" // Generated NOLINT +#include "third_party/iaccessible2/ia2_api_all.h" #include "webkit/glue/webaccessibility.h" class BrowserAccessibilityManagerWin; diff --git a/third_party/iaccessible2/iaccessible2.gyp b/third_party/iaccessible2/iaccessible2.gyp index 65b6895..ae60d5a 100644 --- a/third_party/iaccessible2/iaccessible2.gyp +++ b/third_party/iaccessible2/iaccessible2.gyp @@ -3,15 +3,8 @@ # found in the LICENSE file. { - 'includes': [ - '../../build/common.gypi', - ], - - 'target_defaults': { - 'include_dirs': [ - '.', - '<(INTERMEDIATE_DIR)', - ], + 'variables': { + 'midl_out_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/iaccessible2', }, 'targets': [ { @@ -19,14 +12,18 @@ 'type': 'static_library', 'sources': [ 'ia2_api_all.idl', - '<(INTERMEDIATE_DIR)/ia2_api_all.h', - '<(INTERMEDIATE_DIR)/ia2_api_all_i.c', + '<(midl_out_dir)/ia2_api_all.h', + '<(midl_out_dir)/ia2_api_all_i.c', ], 'hard_dependency': 1, + 'msvs_settings': { + 'VCMIDLTool': { + 'OutputDirectory': '<(midl_out_dir)', + }, + }, 'direct_dependent_settings': { 'include_dirs': [ - # Bit of a hack to work around the built in vstudio rule. - '<(INTERMEDIATE_DIR)/../iaccessible2', + '<(SHARED_INTERMEDIATE_DIR)', ], }, }, @@ -37,8 +34,8 @@ 'dependencies': [ 'iaccessible2' ], 'sources': [ 'IAccessible2Proxy.def', - '<(INTERMEDIATE_DIR)/../iaccessible2/dlldata.c', - '<(INTERMEDIATE_DIR)/../iaccessible2/ia2_api_all_p.c', + '<(midl_out_dir)/dlldata.c', + '<(midl_out_dir)/ia2_api_all_p.c', ], 'link_settings': { 'libraries': [ |