OLD | NEW |
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 "chrome/browser/ui/tabs/tab_strip_model.h" | 5 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/path_service.h" | |
13 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
14 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
15 #include "base/strings/string_split.h" | 14 #include "base/strings/string_split.h" |
16 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
17 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
18 #include "chrome/browser/defaults.h" | 17 #include "chrome/browser/defaults.h" |
19 #include "chrome/browser/extensions/tab_helper.h" | 18 #include "chrome/browser/extensions/tab_helper.h" |
20 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
21 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
22 #include "chrome/browser/ui/browser_tabstrip.h" | 21 #include "chrome/browser/ui/browser_tabstrip.h" |
(...skipping 2550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2573 WebContents* moved_contents = strip_src.DetachWebContentsAt(1); | 2572 WebContents* moved_contents = strip_src.DetachWebContentsAt(1); |
2574 EXPECT_EQ(contents2, moved_contents); | 2573 EXPECT_EQ(contents2, moved_contents); |
2575 | 2574 |
2576 // Attach the tab to the destination tab strip. | 2575 // Attach the tab to the destination tab strip. |
2577 strip_dst.AppendWebContents(moved_contents, true); | 2576 strip_dst.AppendWebContents(moved_contents, true); |
2578 EXPECT_TRUE(strip_dst.IsTabBlocked(0)); | 2577 EXPECT_TRUE(strip_dst.IsTabBlocked(0)); |
2579 | 2578 |
2580 strip_dst.CloseAllTabs(); | 2579 strip_dst.CloseAllTabs(); |
2581 strip_src.CloseAllTabs(); | 2580 strip_src.CloseAllTabs(); |
2582 } | 2581 } |
OLD | NEW |