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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 97683002: Move kFtpScheme into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 1041
1042 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) { 1042 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) {
1043 CommandUpdater* command_updater = 1043 CommandUpdater* command_updater =
1044 browser()->command_controller()->command_updater(); 1044 browser()->command_controller()->command_updater();
1045 1045
1046 net::SpawnedTestServer test_server(net::SpawnedTestServer::TYPE_FTP, 1046 net::SpawnedTestServer test_server(net::SpawnedTestServer::TYPE_FTP,
1047 net::SpawnedTestServer::kLocalhost, 1047 net::SpawnedTestServer::kLocalhost,
1048 base::FilePath(kDocRoot)); 1048 base::FilePath(kDocRoot));
1049 ASSERT_TRUE(test_server.Start()); 1049 ASSERT_TRUE(test_server.Start());
1050 GURL ftp_url(test_server.GetURL(std::string())); 1050 GURL ftp_url(test_server.GetURL(std::string()));
1051 ASSERT_TRUE(ftp_url.SchemeIs(chrome::kFtpScheme)); 1051 ASSERT_TRUE(ftp_url.SchemeIs(content::kFtpScheme));
1052 ui_test_utils::NavigateToURL(browser(), ftp_url); 1052 ui_test_utils::NavigateToURL(browser(), ftp_url);
1053 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); 1053 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
1054 } 1054 }
1055 1055
1056 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) { 1056 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) {
1057 CommandUpdater* command_updater = 1057 CommandUpdater* command_updater =
1058 browser()->command_controller()->command_updater(); 1058 browser()->command_controller()->command_updater();
1059 1059
1060 // Urls that should not have shortcuts. 1060 // Urls that should not have shortcuts.
1061 GURL new_tab_url(chrome::kChromeUINewTabURL); 1061 GURL new_tab_url(chrome::kChromeUINewTabURL);
(...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after
2552 exp_commit_size.Enlarge(wcv_resize_insets.width(), 2552 exp_commit_size.Enlarge(wcv_resize_insets.width(),
2553 wcv_resize_insets.height() + height_inset); 2553 wcv_resize_insets.height() + height_inset);
2554 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2554 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2555 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2555 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2556 // Sizes of RenderWidgetHostView and WebContentsView before and after 2556 // Sizes of RenderWidgetHostView and WebContentsView before and after
2557 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. 2557 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same.
2558 EXPECT_EQ(rwhv_commit_size2, 2558 EXPECT_EQ(rwhv_commit_size2,
2559 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2559 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2560 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); 2560 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize());
2561 } 2561 }
OLDNEW
« no previous file with comments | « chrome/browser/translate/translate_manager_unittest.cc ('k') | chrome/browser/web_applications/web_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698