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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
8 #include "chrome/browser/devtools/devtools_window_testing.h" | 8 #include "chrome/browser/devtools/devtools_window_testing.h" |
9 #include "chrome/browser/download/download_shelf.h" | 9 #include "chrome/browser/download/download_shelf.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 | 49 |
50 // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED | 50 // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED |
51 DevToolsWindow* devtools_window = | 51 DevToolsWindow* devtools_window = |
52 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); | 52 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); |
53 | 53 |
54 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF | 54 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF |
55 browser()->window()->GetDownloadShelf()->Show(); | 55 browser()->window()->GetDownloadShelf()->Show(); |
56 | 56 |
57 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT | 57 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT |
58 BookmarkModel* bookmark_model = | 58 BookmarkModel* bookmark_model = |
59 BookmarkModelFactory::GetForProfile(browser()->profile()); | 59 BookmarkModelFactory::GetForBrowserContext(browser()->profile()); |
60 if (bookmark_model) { | 60 if (bookmark_model) { |
61 if (!bookmark_model->loaded()) | 61 if (!bookmark_model->loaded()) |
62 bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model); | 62 bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model); |
63 | 63 |
64 bookmarks::AddIfNotBookmarked(bookmark_model, | 64 bookmarks::AddIfNotBookmarked(bookmark_model, |
65 GURL(url::kAboutBlankURL), | 65 GURL(url::kAboutBlankURL), |
66 base::ASCIIToUTF16("about")); | 66 base::ASCIIToUTF16("about")); |
67 } | 67 } |
68 | 68 |
69 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { | 69 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 } | 126 } |
127 | 127 |
128 // Open the 11th tab. | 128 // Open the 11th tab. |
129 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), | 129 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), |
130 Referrer(), | 130 Referrer(), |
131 NEW_BACKGROUND_TAB, | 131 NEW_BACKGROUND_TAB, |
132 ui::PAGE_TRANSITION_TYPED, | 132 ui::PAGE_TRANSITION_TYPED, |
133 false)); | 133 false)); |
134 CheckViewID(VIEW_ID_TAB_LAST, true); | 134 CheckViewID(VIEW_ID_TAB_LAST, true); |
135 } | 135 } |
OLD | NEW |