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

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

Issue 8343052: Sync Promo: Tweak first tabs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: diff against correct branch Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #if defined(OS_MACOSX) 9 #if defined(OS_MACOSX)
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 // Make sure the state matches. 1020 // Make sure the state matches.
1021 TabStripModel* new_model = new_browser->tabstrip_model(); 1021 TabStripModel* new_model = new_browser->tabstrip_model();
1022 EXPECT_TRUE(new_model->IsAppTab(0)); 1022 EXPECT_TRUE(new_model->IsAppTab(0));
1023 EXPECT_FALSE(new_model->IsAppTab(1)); 1023 EXPECT_FALSE(new_model->IsAppTab(1));
1024 EXPECT_FALSE(new_model->IsAppTab(2)); 1024 EXPECT_FALSE(new_model->IsAppTab(2));
1025 1025
1026 EXPECT_TRUE(new_model->IsTabPinned(0)); 1026 EXPECT_TRUE(new_model->IsTabPinned(0));
1027 EXPECT_TRUE(new_model->IsTabPinned(1)); 1027 EXPECT_TRUE(new_model->IsTabPinned(1));
1028 EXPECT_FALSE(new_model->IsTabPinned(2)); 1028 EXPECT_FALSE(new_model->IsTabPinned(2));
1029 1029
1030 EXPECT_EQ(browser()->GetHomePage(), 1030 EXPECT_EQ(browser()->profile()->GetHomePage(),
1031 new_model->GetTabContentsAt(2)->tab_contents()->GetURL()); 1031 new_model->GetTabContentsAt(2)->tab_contents()->GetURL());
1032 1032
1033 EXPECT_TRUE( 1033 EXPECT_TRUE(
1034 new_model->GetTabContentsAt(0)->extension_tab_helper()->extension_app() == 1034 new_model->GetTabContentsAt(0)->extension_tab_helper()->extension_app() ==
1035 extension_app); 1035 extension_app);
1036 } 1036 }
1037 #endif // !defined(OS_CHROMEOS) 1037 #endif // !defined(OS_CHROMEOS)
1038 1038
1039 // This test verifies we don't crash when closing the last window and the app 1039 // This test verifies we don't crash when closing the last window and the app
1040 // menu is showing. 1040 // menu is showing.
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 1227
1228 // The normal browser should now have four. 1228 // The normal browser should now have four.
1229 EXPECT_EQ(4, browser()->tab_count()); 1229 EXPECT_EQ(4, browser()->tab_count());
1230 1230
1231 // Close the additional browsers. 1231 // Close the additional browsers.
1232 popup_browser->CloseAllTabs(); 1232 popup_browser->CloseAllTabs();
1233 app_browser->CloseAllTabs(); 1233 app_browser->CloseAllTabs();
1234 app_popup_browser->CloseAllTabs(); 1234 app_popup_browser->CloseAllTabs();
1235 } 1235 }
1236 #endif 1236 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698