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

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

Issue 1436583002: Revert of Remove setVoiceSearchSupported part of EmbeddedSearch SearchBox API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
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/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_testing.h" 10 #include "chrome/browser/devtools/devtools_window_testing.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 base::ASCIIToUTF16("about")); 65 base::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_BROWSER_ACTION || 72 i == VIEW_ID_BROWSER_ACTION ||
73 i == VIEW_ID_FEEDBACK_BUTTON || 73 i == VIEW_ID_FEEDBACK_BUTTON ||
74 i == VIEW_ID_SCRIPT_BUBBLE || 74 i == VIEW_ID_SCRIPT_BUBBLE ||
75 i == VIEW_ID_MIC_SEARCH_BUTTON ||
75 i == VIEW_ID_SAVE_CREDIT_CARD_BUTTON || 76 i == VIEW_ID_SAVE_CREDIT_CARD_BUTTON ||
76 i == VIEW_ID_TRANSLATE_BUTTON) { 77 i == VIEW_ID_TRANSLATE_BUTTON) {
77 continue; 78 continue;
78 } 79 }
79 80
80 CheckViewID(static_cast<ViewID>(i), true); 81 CheckViewID(static_cast<ViewID>(i), true);
81 } 82 }
82 83
83 CheckViewID(VIEW_ID_TAB, true); 84 CheckViewID(VIEW_ID_TAB, true);
84 CheckViewID(VIEW_ID_TAB_STRIP, true); 85 CheckViewID(VIEW_ID_TAB_STRIP, true);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 } 122 }
122 123
123 // Open the 11th tab. 124 // Open the 11th tab.
124 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), 125 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL),
125 Referrer(), 126 Referrer(),
126 NEW_BACKGROUND_TAB, 127 NEW_BACKGROUND_TAB,
127 ui::PAGE_TRANSITION_TYPED, 128 ui::PAGE_TRANSITION_TYPED,
128 false)); 129 false));
129 CheckViewID(VIEW_ID_TAB_LAST, true); 130 CheckViewID(VIEW_ID_TAB_LAST, true);
130 } 131 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698