diff options
author | Ben Murdoch <benm@google.com> | 2011-01-07 14:18:56 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:13 +0000 |
commit | 201ade2fbba22bfb27ae029f4d23fca6ded109a0 (patch) | |
tree | b793f4ed916f73cf18357ea467ff3deb5ffb5b52 /chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm | |
parent | d8c4c37a7d0961944bfdfaa117d5c68c8e129c97 (diff) | |
download | external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.zip external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.gz external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.bz2 |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
Diffstat (limited to 'chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm')
-rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index c2f9026..5f06ce5 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -10,9 +10,9 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/browser.h" #include "chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h" #include "chrome/browser/cocoa/browser_test_helper.h" +#include "chrome/browser/ui/browser.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" |