Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc

Issue 8224023: Don't show URL for pending new navigations initiated by the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 17 matching lines...) Expand all
28 // PageNavigator implementation that records the URL. 28 // PageNavigator implementation that records the URL.
29 class TestingPageNavigator : public PageNavigator { 29 class TestingPageNavigator : public PageNavigator {
30 public: 30 public:
31 // Deprecated. Please use one-argument variant. 31 // Deprecated. Please use one-argument variant.
32 // TODO(adriansc): Remove this method once refactoring changed all call 32 // TODO(adriansc): Remove this method once refactoring changed all call
33 // sites. 33 // sites.
34 virtual TabContents* OpenURL(const GURL& url, 34 virtual TabContents* OpenURL(const GURL& url,
35 const GURL& referrer, 35 const GURL& referrer,
36 WindowOpenDisposition disposition, 36 WindowOpenDisposition disposition,
37 content::PageTransition transition) OVERRIDE { 37 content::PageTransition transition) OVERRIDE {
38 return OpenURL(OpenURLParams(url, referrer, disposition, transition)); 38 return OpenURL(OpenURLParams(url, referrer, disposition, transition,
39 false));
39 } 40 }
40 41
41 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { 42 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE {
42 urls_.push_back(params.url); 43 urls_.push_back(params.url);
43 return NULL; 44 return NULL;
44 } 45 }
45 46
46 std::vector<GURL> urls_; 47 std::vector<GURL> urls_;
47 }; 48 };
48 49
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url()); 313 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url());
313 314
314 controller.reset(new BookmarkContextMenu( 315 controller.reset(new BookmarkContextMenu(
315 NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false)); 316 NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
316 // Cut the URL. 317 // Cut the URL.
317 controller->ExecuteCommand(IDC_CUT); 318 controller->ExecuteCommand(IDC_CUT);
318 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); 319 ASSERT_TRUE(bb_node->GetChild(0)->is_url());
319 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); 320 ASSERT_TRUE(bb_node->GetChild(1)->is_folder());
320 ASSERT_EQ(old_count, bb_node->child_count()); 321 ASSERT_EQ(old_count, bb_node->child_count());
321 } 322 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc ('k') | chrome/browser/ui/views/tabs/dragged_tab_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698