| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 ui_controls::MouseButton button, | 51 ui_controls::MouseButton button, |
| 52 int state, | 52 int state, |
| 53 const base::Closure& closure) { | 53 const base::Closure& closure) { |
| 54 ui_controls::SendMouseMove(screen_pos.x(), screen_pos.y()); | 54 ui_controls::SendMouseMove(screen_pos.x(), screen_pos.y()); |
| 55 ui_controls::SendMouseEventsNotifyWhenDone(button, state, closure); | 55 ui_controls::SendMouseEventsNotifyWhenDone(button, state, closure); |
| 56 } | 56 } |
| 57 | 57 |
| 58 class ViewsDelegateImpl : public views::ViewsDelegate { | 58 class ViewsDelegateImpl : public views::ViewsDelegate { |
| 59 public: | 59 public: |
| 60 ViewsDelegateImpl() {} | 60 ViewsDelegateImpl() {} |
| 61 virtual ui::Clipboard* GetClipboard() const OVERRIDE { return NULL; } | |
| 62 virtual void SaveWindowPlacement(const views::Widget* window, | 61 virtual void SaveWindowPlacement(const views::Widget* window, |
| 63 const std::string& window_name, | 62 const std::string& window_name, |
| 64 const gfx::Rect& bounds, | 63 const gfx::Rect& bounds, |
| 65 ui::WindowShowState show_state) OVERRIDE {} | 64 ui::WindowShowState show_state) OVERRIDE {} |
| 66 virtual bool GetSavedWindowPlacement( | 65 virtual bool GetSavedWindowPlacement( |
| 67 const std::string& window_name, | 66 const std::string& window_name, |
| 68 gfx::Rect* bounds, | 67 gfx::Rect* bounds, |
| 69 ui::WindowShowState* show_state) const OVERRIDE { | 68 ui::WindowShowState* show_state) const OVERRIDE { |
| 70 return false; | 69 return false; |
| 71 } | 70 } |
| (...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1713 Done(); | 1712 Done(); |
| 1714 } | 1713 } |
| 1715 }; | 1714 }; |
| 1716 | 1715 |
| 1717 #if defined(OS_WIN) | 1716 #if defined(OS_WIN) |
| 1718 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu | 1717 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu |
| 1719 #else | 1718 #else |
| 1720 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu | 1719 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu |
| 1721 #endif | 1720 #endif |
| 1722 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu) | 1721 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu) |
| OLD | NEW |