| 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/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
| 6 #include "base/string_number_conversions.h" | 6 #include "base/string_number_conversions.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/automation/ui_controls.h" | 9 #include "chrome/browser/automation/ui_controls.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 111 |
| 112 // PageNavigator implementation that records the URL. | 112 // PageNavigator implementation that records the URL. |
| 113 class TestingPageNavigator : public PageNavigator { | 113 class TestingPageNavigator : public PageNavigator { |
| 114 public: | 114 public: |
| 115 // Deprecated. Please use the one-argument variant. | 115 // Deprecated. Please use the one-argument variant. |
| 116 // TODO(adriansc): Remove this function once refactoring has changed | 116 // TODO(adriansc): Remove this function once refactoring has changed |
| 117 // all call sites. | 117 // all call sites. |
| 118 virtual TabContents* OpenURL(const GURL& url, | 118 virtual TabContents* OpenURL(const GURL& url, |
| 119 const GURL& referrer, | 119 const GURL& referrer, |
| 120 WindowOpenDisposition disposition, | 120 WindowOpenDisposition disposition, |
| 121 PageTransition::Type transition) OVERRIDE { | 121 content::PageTransition transition) OVERRIDE { |
| 122 return OpenURL(OpenURLParams(url, referrer, disposition, transition)); | 122 return OpenURL(OpenURLParams(url, referrer, disposition, transition)); |
| 123 } | 123 } |
| 124 | 124 |
| 125 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { | 125 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { |
| 126 url_ = params.url; | 126 url_ = params.url; |
| 127 return NULL; | 127 return NULL; |
| 128 } | 128 } |
| 129 | 129 |
| 130 GURL url_; | 130 GURL url_; |
| 131 }; | 131 }; |
| (...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1572 ASSERT_TRUE(menu != NULL); | 1572 ASSERT_TRUE(menu != NULL); |
| 1573 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 1573 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |
| 1574 | 1574 |
| 1575 menu->GetMenuController()->CancelAll(); | 1575 menu->GetMenuController()->CancelAll(); |
| 1576 | 1576 |
| 1577 Done(); | 1577 Done(); |
| 1578 } | 1578 } |
| 1579 }; | 1579 }; |
| 1580 | 1580 |
| 1581 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) | 1581 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) |
| OLD | NEW |