| OLD | NEW | 
|     1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |     1 // Copyright (c) 2011 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|    68 #define MAYBE_ScrollButtonScrolls ScrollButtonScrolls |    68 #define MAYBE_ScrollButtonScrolls ScrollButtonScrolls | 
|    69  |    69  | 
|    70 #endif |    70 #endif | 
|    71  |    71  | 
|    72 namespace { |    72 namespace { | 
|    73  |    73  | 
|    74 class ViewsDelegateImpl : public views::ViewsDelegate { |    74 class ViewsDelegateImpl : public views::ViewsDelegate { | 
|    75  public: |    75  public: | 
|    76   ViewsDelegateImpl() {} |    76   ViewsDelegateImpl() {} | 
|    77   virtual ui::Clipboard* GetClipboard() const OVERRIDE { return NULL; } |    77   virtual ui::Clipboard* GetClipboard() const OVERRIDE { return NULL; } | 
|    78   virtual views::View* GetDefaultParentView() OVERRIDE { return NULL; } |  | 
|    79   virtual void SaveWindowPlacement(const views::Widget* window, |    78   virtual void SaveWindowPlacement(const views::Widget* window, | 
|    80                                    const std::string& window_name, |    79                                    const std::string& window_name, | 
|    81                                    const gfx::Rect& bounds, |    80                                    const gfx::Rect& bounds, | 
|    82                                    ui::WindowShowState show_state) OVERRIDE {} |    81                                    ui::WindowShowState show_state) OVERRIDE {} | 
|    83   virtual bool GetSavedWindowPlacement( |    82   virtual bool GetSavedWindowPlacement( | 
|    84       const std::string& window_name, |    83       const std::string& window_name, | 
|    85       gfx::Rect* bounds, |    84       gfx::Rect* bounds, | 
|    86       ui::WindowShowState* show_state) const OVERRIDE { |    85       ui::WindowShowState* show_state) const OVERRIDE { | 
|    87     return false; |    86     return false; | 
|    88   } |    87   } | 
| (...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1579     ASSERT_TRUE(menu != NULL); |  1578     ASSERT_TRUE(menu != NULL); | 
|  1580     ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |  1579     ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 
|  1581  |  1580  | 
|  1582     menu->GetMenuController()->CancelAll(); |  1581     menu->GetMenuController()->CancelAll(); | 
|  1583  |  1582  | 
|  1584     Done(); |  1583     Done(); | 
|  1585   } |  1584   } | 
|  1586 }; |  1585 }; | 
|  1587  |  1586  | 
|  1588 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) |  1587 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) | 
| OLD | NEW |