diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/cocoa/framed_browser_window_unittest.mm | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/cocoa/framed_browser_window_unittest.mm')
| -rw-r--r-- | chrome/browser/cocoa/framed_browser_window_unittest.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/framed_browser_window_unittest.mm b/chrome/browser/cocoa/framed_browser_window_unittest.mm index ae9c329..5638561 100644 --- a/chrome/browser/cocoa/framed_browser_window_unittest.mm +++ b/chrome/browser/cocoa/framed_browser_window_unittest.mm @@ -4,8 +4,9 @@ #import <Cocoa/Cocoa.h> +#include "base/debug/debugger.h" #include "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/browser_frame_view.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" @@ -27,7 +28,7 @@ class FramedBrowserWindowTest : public CocoaTest { styleMask:mask backing:NSBackingStoreBuffered defer:NO]; - if (DebugUtil::BeingDebugged()) { + if (base::debug::BeingDebugged()) { [window_ orderFront:nil]; } else { [window_ orderBack:nil]; |