| 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 10 #include "chrome/browser/devtools/devtools_window.h" | 10 #include "chrome/browser/devtools/devtools_window.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF | 52 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF |
| 53 browser()->window()->GetDownloadShelf()->Show(); | 53 browser()->window()->GetDownloadShelf()->Show(); |
| 54 | 54 |
| 55 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT | 55 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT |
| 56 BookmarkModel* bookmark_model = | 56 BookmarkModel* bookmark_model = |
| 57 BookmarkModelFactory::GetForProfile(browser()->profile()); | 57 BookmarkModelFactory::GetForProfile(browser()->profile()); |
| 58 if (bookmark_model) { | 58 if (bookmark_model) { |
| 59 if (!bookmark_model->loaded()) | 59 if (!bookmark_model->loaded()) |
| 60 test::WaitForBookmarkModelToLoad(bookmark_model); | 60 test::WaitForBookmarkModelToLoad(bookmark_model); |
| 61 | 61 |
| 62 bookmark_utils::AddIfNotBookmarked(bookmark_model, | 62 bookmarks::AddIfNotBookmarked(bookmark_model, |
| 63 GURL(url::kAboutBlankURL), | 63 GURL(url::kAboutBlankURL), |
| 64 base::ASCIIToUTF16("about")); | 64 base::ASCIIToUTF16("about")); |
| 65 } | 65 } |
| 66 | 66 |
| 67 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { | 67 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { |
| 68 // Mac implementation does not support following ids yet. | 68 // Mac implementation does not support following ids yet. |
| 69 if (i == VIEW_ID_STAR_BUTTON || | 69 if (i == VIEW_ID_STAR_BUTTON || |
| 70 i == VIEW_ID_CONTENTS_SPLIT || | 70 i == VIEW_ID_CONTENTS_SPLIT || |
| 71 i == VIEW_ID_BROWSER_ACTION || | 71 i == VIEW_ID_BROWSER_ACTION || |
| 72 i == VIEW_ID_FEEDBACK_BUTTON || | 72 i == VIEW_ID_FEEDBACK_BUTTON || |
| 73 i == VIEW_ID_SCRIPT_BUBBLE || | 73 i == VIEW_ID_SCRIPT_BUBBLE || |
| 74 i == VIEW_ID_MIC_SEARCH_BUTTON || | 74 i == VIEW_ID_MIC_SEARCH_BUTTON || |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 } | 117 } |
| 118 | 118 |
| 119 // Open the 11th tab. | 119 // Open the 11th tab. |
| 120 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), | 120 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), |
| 121 Referrer(), | 121 Referrer(), |
| 122 NEW_BACKGROUND_TAB, | 122 NEW_BACKGROUND_TAB, |
| 123 content::PAGE_TRANSITION_TYPED, | 123 content::PAGE_TRANSITION_TYPED, |
| 124 false)); | 124 false)); |
| 125 CheckViewID(VIEW_ID_TAB_LAST, true); | 125 CheckViewID(VIEW_ID_TAB_LAST, true); |
| 126 } | 126 } |
| OLD | NEW |