Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Side by Side Diff: chrome/browser/cocoa/view_id_util_browsertest.mm

Issue 3129003: remove toolstrips (Closed)
Patch Set: merge Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/dom_ui/dom_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/logging.h" 5 #include "base/logging.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/bookmarks/bookmark_model.h" 7 #include "chrome/browser/bookmarks/bookmark_model.h"
8 #include "chrome/browser/browser.h" 8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/browser_window.h" 9 #include "chrome/browser/browser_window.h"
10 #include "chrome/browser/cocoa/view_id_util.h" 10 #include "chrome/browser/cocoa/view_id_util.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 BookmarkModel* bookmark_model = browser()->profile()->GetBookmarkModel(); 46 BookmarkModel* bookmark_model = browser()->profile()->GetBookmarkModel();
47 if (bookmark_model) { 47 if (bookmark_model) {
48 if (!bookmark_model->IsLoaded()) 48 if (!bookmark_model->IsLoaded())
49 ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model); 49 ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model);
50 50
51 bookmark_model->SetURLStarred(GURL(chrome::kAboutBlankURL), 51 bookmark_model->SetURLStarred(GURL(chrome::kAboutBlankURL),
52 UTF8ToUTF16("about"), true); 52 UTF8ToUTF16("about"), true);
53 } 53 }
54 54
55 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { 55 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) {
56 // Extension shelf is being removed, http://crbug.com/30178.
57 if (i == VIEW_ID_DEV_EXTENSION_SHELF)
58 continue;
59
60 // Mac implementation does not support following ids yet. 56 // Mac implementation does not support following ids yet.
61 if (i == VIEW_ID_STAR_BUTTON || 57 if (i == VIEW_ID_STAR_BUTTON ||
62 i == VIEW_ID_AUTOCOMPLETE || 58 i == VIEW_ID_AUTOCOMPLETE ||
63 i == VIEW_ID_CONTENTS_SPLIT) { 59 i == VIEW_ID_CONTENTS_SPLIT) {
64 continue; 60 continue;
65 } 61 }
66 62
67 CheckViewID(static_cast<ViewID>(i), true); 63 CheckViewID(static_cast<ViewID>(i), true);
68 } 64 }
69 65
(...skipping 27 matching lines...) Expand all
97 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); 93 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true);
98 // VIEW_ID_TAB_LAST should always be available. 94 // VIEW_ID_TAB_LAST should always be available.
99 CheckViewID(VIEW_ID_TAB_LAST, true); 95 CheckViewID(VIEW_ID_TAB_LAST, true);
100 } 96 }
101 97
102 // Open the 11th tab. 98 // Open the 11th tab.
103 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), 99 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(),
104 NEW_BACKGROUND_TAB, PageTransition::TYPED); 100 NEW_BACKGROUND_TAB, PageTransition::TYPED);
105 CheckViewID(VIEW_ID_TAB_LAST, true); 101 CheckViewID(VIEW_ID_TAB_LAST, true);
106 } 102 }
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/dom_ui/dom_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698