OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/bookmarks/bookmark_bubble_sign_in_delegate.h" | 5 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" |
6 | 6 |
7 #include "base/basictypes.h" | |
8 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "build/build_config.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
11 #include "chrome/browser/extensions/test_extension_service.h" | 12 #include "chrome/browser/extensions/test_extension_service.h" |
12 #include "chrome/browser/extensions/test_extension_system.h" | 13 #include "chrome/browser/extensions/test_extension_system.h" |
13 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/browser_list.h" | 15 #include "chrome/browser/ui/browser_list.h" |
15 #include "chrome/browser/ui/browser_navigator_params.h" | 16 #include "chrome/browser/ui/browser_navigator_params.h" |
16 #include "chrome/browser/ui/singleton_tabs.h" | 17 #include "chrome/browser/ui/singleton_tabs.h" |
17 #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h" | 18 #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
19 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" | 20 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 | 140 |
140 if (kHasProfileChooser) { | 141 if (kHasProfileChooser) { |
141 EXPECT_TRUE(ProfileChooserView::IsShowing()); | 142 EXPECT_TRUE(ProfileChooserView::IsShowing()); |
142 } else { | 143 } else { |
143 // A new tab should have been opened in the extra browser, which should be | 144 // A new tab should have been opened in the extra browser, which should be |
144 // visible. | 145 // visible. |
145 int tab_count = extra_browser->tab_strip_model()->count(); | 146 int tab_count = extra_browser->tab_strip_model()->count(); |
146 EXPECT_EQ(starting_tab_count + 1, tab_count); | 147 EXPECT_EQ(starting_tab_count + 1, tab_count); |
147 } | 148 } |
148 } | 149 } |
OLD | NEW |