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

Side by Side Diff: chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc

Issue 161113002: Fix pushState causing stop/reload button and favicon to flicker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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) 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 "ui/web_dialogs/web_dialog_web_contents_delegate.h" 5 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 }; 62 };
63 63
64 TEST_F(WebDialogWebContentsDelegateTest, DoNothingMethodsTest) { 64 TEST_F(WebDialogWebContentsDelegateTest, DoNothingMethodsTest) {
65 // None of the following calls should do anything. 65 // None of the following calls should do anything.
66 EXPECT_TRUE(test_web_contents_delegate_->IsPopupOrPanel(NULL)); 66 EXPECT_TRUE(test_web_contents_delegate_->IsPopupOrPanel(NULL));
67 history::HistoryAddPageArgs should_add_args( 67 history::HistoryAddPageArgs should_add_args(
68 GURL(), base::Time::Now(), 0, 0, GURL(), history::RedirectList(), 68 GURL(), base::Time::Now(), 0, 0, GURL(), history::RedirectList(),
69 content::PAGE_TRANSITION_TYPED, history::SOURCE_SYNCED, false); 69 content::PAGE_TRANSITION_TYPED, history::SOURCE_SYNCED, false);
70 test_web_contents_delegate_->NavigationStateChanged(NULL, 0); 70 test_web_contents_delegate_->NavigationStateChanged(NULL, 0);
71 test_web_contents_delegate_->ActivateContents(NULL); 71 test_web_contents_delegate_->ActivateContents(NULL);
72 test_web_contents_delegate_->LoadingStateChanged(NULL); 72 test_web_contents_delegate_->LoadingStateChanged(NULL, true);
73 test_web_contents_delegate_->CloseContents(NULL); 73 test_web_contents_delegate_->CloseContents(NULL);
74 test_web_contents_delegate_->UpdateTargetURL(NULL, 0, GURL()); 74 test_web_contents_delegate_->UpdateTargetURL(NULL, 0, GURL());
75 test_web_contents_delegate_->MoveContents(NULL, gfx::Rect()); 75 test_web_contents_delegate_->MoveContents(NULL, gfx::Rect());
76 EXPECT_EQ(0, browser()->tab_strip_model()->count()); 76 EXPECT_EQ(0, browser()->tab_strip_model()->count());
77 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); 77 EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
78 } 78 }
79 79
80 TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) { 80 TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) {
81 test_web_contents_delegate_->OpenURLFromTab( 81 test_web_contents_delegate_->OpenURLFromTab(
82 NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(), 82 NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(),
(...skipping 21 matching lines...) Expand all
104 test_web_contents_delegate_->OpenURLFromTab( 104 test_web_contents_delegate_->OpenURLFromTab(
105 NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(), 105 NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(),
106 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); 106 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
107 test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB, 107 test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB,
108 gfx::Rect(), false, NULL); 108 gfx::Rect(), false, NULL);
109 EXPECT_EQ(0, browser()->tab_strip_model()->count()); 109 EXPECT_EQ(0, browser()->tab_strip_model()->count());
110 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); 110 EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
111 } 111 }
112 112
113 } // namespace 113 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_host.cc ('k') | components/web_contents_delegate_android/web_contents_delegate_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698