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

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

Issue 288923004: Add an extension override bubble and warning box for proxy extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 6 years, 6 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
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/ui/view_ids.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) 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.h" 10 #include "chrome/browser/devtools/devtools_window.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 bookmark_utils::AddIfNotBookmarked( 62 bookmark_utils::AddIfNotBookmarked(
63 bookmark_model, GURL(content::kAboutBlankURL), 63 bookmark_model, GURL(content::kAboutBlankURL),
64 base::ASCIIToUTF16("about")); 64 base::ASCIIToUTF16("about"));
65 } 65 }
66 66
67 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { 67 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) {
68 // Mac implementation does not support following ids yet. 68 // Mac implementation does not support following ids yet.
69 if (i == VIEW_ID_STAR_BUTTON || 69 if (i == VIEW_ID_STAR_BUTTON ||
70 i == VIEW_ID_CONTENTS_SPLIT || 70 i == VIEW_ID_CONTENTS_SPLIT ||
71 i == VIEW_ID_BROWSER_ACTION ||
71 i == VIEW_ID_FEEDBACK_BUTTON || 72 i == VIEW_ID_FEEDBACK_BUTTON ||
72 i == VIEW_ID_SCRIPT_BUBBLE || 73 i == VIEW_ID_SCRIPT_BUBBLE ||
73 i == VIEW_ID_MIC_SEARCH_BUTTON || 74 i == VIEW_ID_MIC_SEARCH_BUTTON ||
74 i == VIEW_ID_TRANSLATE_BUTTON) { 75 i == VIEW_ID_TRANSLATE_BUTTON) {
75 continue; 76 continue;
76 } 77 }
77 78
78 CheckViewID(static_cast<ViewID>(i), true); 79 CheckViewID(static_cast<ViewID>(i), true);
79 } 80 }
80 81
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 // VIEW_ID_TAB_LAST should always be available. 113 // VIEW_ID_TAB_LAST should always be available.
113 CheckViewID(VIEW_ID_TAB_LAST, true); 114 CheckViewID(VIEW_ID_TAB_LAST, true);
114 } 115 }
115 116
116 // Open the 11th tab. 117 // Open the 11th tab.
117 browser()->OpenURL(OpenURLParams( 118 browser()->OpenURL(OpenURLParams(
118 GURL(content::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, 119 GURL(content::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB,
119 content::PAGE_TRANSITION_TYPED, false)); 120 content::PAGE_TRANSITION_TYPED, false));
120 CheckViewID(VIEW_ID_TAB_LAST, true); 121 CheckViewID(VIEW_ID_TAB_LAST, true);
121 } 122 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/ui/view_ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698