diff options
author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 21:29:14 +0000 |
---|---|---|
committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 21:29:14 +0000 |
commit | b320c9742acb12fb2f23f0990fabc87ef31d097f (patch) | |
tree | 3560efee853d8656a0ed515a8e447f25fa6e09d0 /o3d/plugin | |
parent | 91d139522eea3e54dd5a7c0e3594c17f839f5758 (diff) | |
download | chromium_src-b320c9742acb12fb2f23f0990fabc87ef31d097f.zip chromium_src-b320c9742acb12fb2f23f0990fabc87ef31d097f.tar.gz chromium_src-b320c9742acb12fb2f23f0990fabc87ef31d097f.tar.bz2 |
Reverting the o3d parts of: 70009 70345 70353
O3D is frozen on an old version of base, so I believe you want to avoid
updating it in future base changes.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6075009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
-rw-r--r-- | o3d/plugin/mac/fullscreen_window_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/plugin/mac/fullscreen_window_mac.mm b/o3d/plugin/mac/fullscreen_window_mac.mm index fd0a021..e2ba86c 100644 --- a/o3d/plugin/mac/fullscreen_window_mac.mm +++ b/o3d/plugin/mac/fullscreen_window_mac.mm @@ -38,8 +38,8 @@ #import "graphics_utils_mac.h" #import "overlay_window_mac.h" #import "plugin_mac.h" +#import "base/cocoa_protocols_mac.h" #import "base/logging.h" -#import "base/mac/cocoa_protocols.h" #import "base/scoped_nsobject.h" #import "core/cross/display_mode.h" #import "plugin/cross/o3d_glue.h" |