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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 // PageNavigator implementation that records the URL. | 116 // PageNavigator implementation that records the URL. |
117 class TestingPageNavigator : public PageNavigator { | 117 class TestingPageNavigator : public PageNavigator { |
118 public: | 118 public: |
119 // Deprecated. Please use the one-argument variant. | 119 // Deprecated. Please use the one-argument variant. |
120 // TODO(adriansc): Remove this function once refactoring has changed | 120 // TODO(adriansc): Remove this function once refactoring has changed |
121 // all call sites. | 121 // all call sites. |
122 virtual TabContents* OpenURL(const GURL& url, | 122 virtual TabContents* OpenURL(const GURL& url, |
123 const GURL& referrer, | 123 const GURL& referrer, |
124 WindowOpenDisposition disposition, | 124 WindowOpenDisposition disposition, |
125 content::PageTransition transition) OVERRIDE { | 125 content::PageTransition transition) OVERRIDE { |
126 return OpenURL(OpenURLParams(url, referrer, disposition, transition, | 126 return OpenURL(OpenURLParams(url, content::Referrer(), disposition, |
127 false)); | 127 transition, false)); |
128 } | 128 } |
129 | 129 |
130 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { | 130 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { |
131 url_ = params.url; | 131 url_ = params.url; |
132 return NULL; | 132 return NULL; |
133 } | 133 } |
134 | 134 |
135 GURL url_; | 135 GURL url_; |
136 }; | 136 }; |
137 | 137 |
(...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1578 ASSERT_TRUE(menu != NULL); | 1578 ASSERT_TRUE(menu != NULL); |
1579 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 1579 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |
1580 | 1580 |
1581 menu->GetMenuController()->CancelAll(); | 1581 menu->GetMenuController()->CancelAll(); |
1582 | 1582 |
1583 Done(); | 1583 Done(); |
1584 } | 1584 } |
1585 }; | 1585 }; |
1586 | 1586 |
1587 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) | 1587 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) |
OLD | NEW |