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

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

Issue 6913026: Compact Navigation prototype (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Clang build fix. After commit/revert. Created 9 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/download/download_shelf.h" 9 #include "chrome/browser/download/download_shelf.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bookmark_model->SetURLStarred(GURL(chrome::kAboutBlankURL), 65 bookmark_model->SetURLStarred(GURL(chrome::kAboutBlankURL),
66 UTF8ToUTF16("about"), true); 66 UTF8ToUTF16("about"), true);
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) {
70 // Mac implementation does not support following ids yet. 70 // Mac implementation does not support following ids yet.
71 if (i == VIEW_ID_STAR_BUTTON || 71 if (i == VIEW_ID_STAR_BUTTON ||
72 i == VIEW_ID_AUTOCOMPLETE || 72 i == VIEW_ID_AUTOCOMPLETE ||
73 i == VIEW_ID_CONTENTS_SPLIT || 73 i == VIEW_ID_CONTENTS_SPLIT ||
74 i == VIEW_ID_SIDE_BAR_SPLIT || 74 i == VIEW_ID_SIDE_BAR_SPLIT ||
75 i == VIEW_ID_FEEDBACK_BUTTON) { 75 i == VIEW_ID_FEEDBACK_BUTTON ||
76 i == VIEW_ID_COMPACT_NAV_BAR ||
77 i == VIEW_ID_COMPACT_OPT_BAR ||
78 i == VIEW_ID_COMPACT_NAV_BAR_SPACER) {
76 continue; 79 continue;
77 } 80 }
78 81
79 CheckViewID(static_cast<ViewID>(i), true); 82 CheckViewID(static_cast<ViewID>(i), true);
80 } 83 }
81 84
82 CheckViewID(VIEW_ID_TAB, true); 85 CheckViewID(VIEW_ID_TAB, true);
83 CheckViewID(VIEW_ID_TAB_STRIP, true); 86 CheckViewID(VIEW_ID_TAB_STRIP, true);
84 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); 87 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
85 } 88 }
(...skipping 23 matching lines...) Expand all
109 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); 112 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true);
110 // VIEW_ID_TAB_LAST should always be available. 113 // VIEW_ID_TAB_LAST should always be available.
111 CheckViewID(VIEW_ID_TAB_LAST, true); 114 CheckViewID(VIEW_ID_TAB_LAST, true);
112 } 115 }
113 116
114 // Open the 11th tab. 117 // Open the 11th tab.
115 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), 118 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(),
116 NEW_BACKGROUND_TAB, PageTransition::TYPED); 119 NEW_BACKGROUND_TAB, PageTransition::TYPED);
117 CheckViewID(VIEW_ID_TAB_LAST, true); 120 CheckViewID(VIEW_ID_TAB_LAST, true);
118 } 121 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698