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

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

Issue 12377065: Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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) 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_CONTENTS_SPLIT || 71 i == VIEW_ID_CONTENTS_SPLIT ||
72 i == VIEW_ID_FEEDBACK_BUTTON || 72 i == VIEW_ID_FEEDBACK_BUTTON ||
73 i == VIEW_ID_OMNIBOX ||
74 i == VIEW_ID_SCRIPT_BUBBLE) { 73 i == VIEW_ID_SCRIPT_BUBBLE) {
75 continue; 74 continue;
76 } 75 }
77 76
78 CheckViewID(static_cast<ViewID>(i), true); 77 CheckViewID(static_cast<ViewID>(i), true);
79 } 78 }
80 79
81 CheckViewID(VIEW_ID_TAB, true); 80 CheckViewID(VIEW_ID_TAB, true);
82 CheckViewID(VIEW_ID_TAB_STRIP, true); 81 CheckViewID(VIEW_ID_TAB_STRIP, true);
83 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); 82 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
(...skipping 28 matching lines...) Expand all
112 // VIEW_ID_TAB_LAST should always be available. 111 // VIEW_ID_TAB_LAST should always be available.
113 CheckViewID(VIEW_ID_TAB_LAST, true); 112 CheckViewID(VIEW_ID_TAB_LAST, true);
114 } 113 }
115 114
116 // Open the 11th tab. 115 // Open the 11th tab.
117 browser()->OpenURL(OpenURLParams( 116 browser()->OpenURL(OpenURLParams(
118 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, 117 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB,
119 content::PAGE_TRANSITION_TYPED, false)); 118 content::PAGE_TRANSITION_TYPED, false));
120 CheckViewID(VIEW_ID_TAB_LAST, true); 119 CheckViewID(VIEW_ID_TAB_LAST, true);
121 } 120 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm ('k') | chrome/browser/ui/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698