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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_model_unittest.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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 "chrome/browser/ui/toolbar/toolbar_model.h" 5 #include "chrome/browser/ui/toolbar/toolbar_model.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/toolbar/toolbar_model.h" 9 #include "chrome/browser/ui/toolbar/toolbar_model.h"
10 #include "chrome/test/base/browser_with_test_window_test.h" 10 #include "chrome/test/base/browser_with_test_window_test.h"
11 11
12 typedef BrowserWithTestWindowTest ToolbarModelTest; 12 typedef BrowserWithTestWindowTest ToolbarModelTest;
13 13
14 TEST_F(ToolbarModelTest, ShouldDisplayURL) { 14 TEST_F(ToolbarModelTest, ShouldDisplayURL) {
15 browser()->OpenURL(GURL("view-source:http://www.google.com"), 15 browser()->OpenURL(GURL("view-source:http://www.google.com"),
16 GURL(), CURRENT_TAB, PageTransition::TYPED); 16 GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED);
17 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); 17 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
18 EXPECT_EQ(ASCIIToUTF16("view-source:www.google.com"), 18 EXPECT_EQ(ASCIIToUTF16("view-source:www.google.com"),
19 browser()->toolbar_model()->GetText()); 19 browser()->toolbar_model()->GetText());
20 20
21 browser()->OpenURL(GURL("view-source:chrome://newtab/"), 21 browser()->OpenURL(GURL("view-source:chrome://newtab/"),
22 GURL(), CURRENT_TAB, PageTransition::TYPED); 22 GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED);
23 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); 23 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
24 EXPECT_EQ(ASCIIToUTF16("view-source:chrome://newtab"), 24 EXPECT_EQ(ASCIIToUTF16("view-source:chrome://newtab"),
25 browser()->toolbar_model()->GetText()); 25 browser()->toolbar_model()->GetText());
26 26
27 browser()->OpenURL(GURL("chrome-extension://monkey/balls.html"), 27 browser()->OpenURL(GURL("chrome-extension://monkey/balls.html"),
28 GURL(), CURRENT_TAB, PageTransition::TYPED); 28 GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED);
29 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL()); 29 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL());
30 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText()); 30 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText());
31 31
32 browser()->OpenURL(GURL("chrome://newtab/"), 32 browser()->OpenURL(GURL("chrome://newtab/"),
33 GURL(), CURRENT_TAB, PageTransition::TYPED); 33 GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED);
34 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL()); 34 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL());
35 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText()); 35 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText());
36 36
37 browser()->OpenURL(GURL("about:blank"), 37 browser()->OpenURL(GURL("about:blank"),
38 GURL(), CURRENT_TAB, PageTransition::TYPED); 38 GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED);
39 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); 39 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
40 EXPECT_EQ(ASCIIToUTF16("about:blank"), 40 EXPECT_EQ(ASCIIToUTF16("about:blank"),
41 browser()->toolbar_model()->GetText()); 41 browser()->toolbar_model()->GetText());
42 } 42 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search_engines/search_engine_tab_helper.cc ('k') | chrome/browser/ui/views/about_chrome_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698