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

Side by Side Diff: chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc

Issue 1686833003: Remove HostDesktopType from profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-16
Patch Set: desktop linux and mac Created 4 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderer_context_menu/render_view_context_menu.h" 5 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 ASSERT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENLINKINPROFILE)); 467 ASSERT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENLINKINPROFILE));
468 ASSERT_FALSE(menu->IsItemInRangePresent(IDC_OPEN_LINK_IN_PROFILE_FIRST, 468 ASSERT_FALSE(menu->IsItemInRangePresent(IDC_OPEN_LINK_IN_PROFILE_FIRST,
469 IDC_OPEN_LINK_IN_PROFILE_LAST)); 469 IDC_OPEN_LINK_IN_PROFILE_LAST));
470 } 470 }
471 } 471 }
472 472
473 IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, OpenLinkInProfile) { 473 IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, OpenLinkInProfile) {
474 Profile* other_profile = CreateSecondaryProfile(1); 474 Profile* other_profile = CreateSecondaryProfile(1);
475 profiles::FindOrCreateNewWindowForProfile( 475 profiles::FindOrCreateNewWindowForProfile(
476 other_profile, chrome::startup::IS_NOT_PROCESS_STARTUP, 476 other_profile, chrome::startup::IS_NOT_PROCESS_STARTUP,
477 chrome::startup::IS_NOT_FIRST_RUN, chrome::GetActiveDesktop(), false); 477 chrome::startup::IS_NOT_FIRST_RUN, false);
478 478
479 ui_test_utils::WindowedTabAddedNotificationObserver tab_observer( 479 ui_test_utils::WindowedTabAddedNotificationObserver tab_observer(
480 content::NotificationService::AllSources()); 480 content::NotificationService::AllSources());
481 481
482 ASSERT_TRUE(embedded_test_server()->Start()); 482 ASSERT_TRUE(embedded_test_server()->Start());
483 GURL url(embedded_test_server()->GetURL("/")); 483 GURL url(embedded_test_server()->GetURL("/"));
484 484
485 scoped_ptr<TestRenderViewContextMenu> menu( 485 scoped_ptr<TestRenderViewContextMenu> menu(
486 CreateContextMenuMediaTypeNone(url, url)); 486 CreateContextMenuMediaTypeNone(url, url));
487 487
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 IN_PROC_BROWSER_TEST_F(LoadImageBrowserTest, LoadImage) { 798 IN_PROC_BROWSER_TEST_F(LoadImageBrowserTest, LoadImage) {
799 static const char kValidImage[] = "/load_image/image.png"; 799 static const char kValidImage[] = "/load_image/image.png";
800 SetupAndLoadImagePage(kValidImage); 800 SetupAndLoadImagePage(kValidImage);
801 AddLoadImageInterceptor(kValidImage); 801 AddLoadImageInterceptor(kValidImage);
802 AttemptLoadImage(); 802 AttemptLoadImage();
803 interceptor_->WaitForRequests(1); 803 interceptor_->WaitForRequests(1);
804 EXPECT_EQ(1, interceptor_->num_requests()); 804 EXPECT_EQ(1, interceptor_->num_requests());
805 } 805 }
806 806
807 } // namespace 807 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698