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/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/bookmarks/bookmark_model.h" | 9 #include "chrome/browser/bookmarks/bookmark_model.h" |
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 if (!bookmark_model->IsLoaded()) | 61 if (!bookmark_model->IsLoaded()) |
62 ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model); | 62 ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model); |
63 | 63 |
64 bookmark_utils::AddIfNotBookmarked( | 64 bookmark_utils::AddIfNotBookmarked( |
65 bookmark_model, GURL(chrome::kAboutBlankURL), ASCIIToUTF16("about")); | 65 bookmark_model, GURL(chrome::kAboutBlankURL), ASCIIToUTF16("about")); |
66 } | 66 } |
67 | 67 |
68 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { | 68 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { |
69 // Mac implementation does not support following ids yet. | 69 // Mac implementation does not support following ids yet. |
70 if (i == VIEW_ID_STAR_BUTTON || | 70 if (i == VIEW_ID_STAR_BUTTON || |
71 i == VIEW_ID_AUTOCOMPLETE || | |
72 i == VIEW_ID_CONTENTS_SPLIT || | 71 i == VIEW_ID_CONTENTS_SPLIT || |
73 i == VIEW_ID_FEEDBACK_BUTTON || | 72 i == VIEW_ID_FEEDBACK_BUTTON || |
74 i == VIEW_ID_OMNIBOX || | 73 i == VIEW_ID_OMNIBOX || |
75 i == VIEW_ID_SCRIPT_BUBBLE) { | 74 i == VIEW_ID_SCRIPT_BUBBLE) { |
76 continue; | 75 continue; |
77 } | 76 } |
78 | 77 |
79 CheckViewID(static_cast<ViewID>(i), true); | 78 CheckViewID(static_cast<ViewID>(i), true); |
80 } | 79 } |
81 | 80 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 // VIEW_ID_TAB_LAST should always be available. | 112 // VIEW_ID_TAB_LAST should always be available. |
114 CheckViewID(VIEW_ID_TAB_LAST, true); | 113 CheckViewID(VIEW_ID_TAB_LAST, true); |
115 } | 114 } |
116 | 115 |
117 // Open the 11th tab. | 116 // Open the 11th tab. |
118 browser()->OpenURL(OpenURLParams( | 117 browser()->OpenURL(OpenURLParams( |
119 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, | 118 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, |
120 content::PAGE_TRANSITION_TYPED, false)); | 119 content::PAGE_TRANSITION_TYPED, false)); |
121 CheckViewID(VIEW_ID_TAB_LAST, true); | 120 CheckViewID(VIEW_ID_TAB_LAST, true); |
122 } | 121 } |
OLD | NEW |