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

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

Issue 10885024: Integrate Chrome To Mobile with Action Box UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nil/NULL checks in ChromeToMobileBubbleController. Created 8 years, 3 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/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/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_utils.h" 10 #include "chrome/browser/bookmarks/bookmark_utils.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bookmark_utils::AddIfNotBookmarked( 65 bookmark_utils::AddIfNotBookmarked(
66 bookmark_model, GURL(chrome::kAboutBlankURL), ASCIIToUTF16("about")); 66 bookmark_model, GURL(chrome::kAboutBlankURL), ASCIIToUTF16("about"));
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_FEEDBACK_BUTTON || 74 i == VIEW_ID_FEEDBACK_BUTTON ||
75 i == VIEW_ID_OMNIBOX || 75 i == VIEW_ID_OMNIBOX) {
76 i == VIEW_ID_CHROME_TO_MOBILE_BUTTON) {
77 continue; 76 continue;
78 } 77 }
79 78
80 CheckViewID(static_cast<ViewID>(i), true); 79 CheckViewID(static_cast<ViewID>(i), true);
81 } 80 }
82 81
83 CheckViewID(VIEW_ID_TAB, true); 82 CheckViewID(VIEW_ID_TAB, true);
84 CheckViewID(VIEW_ID_TAB_STRIP, true); 83 CheckViewID(VIEW_ID_TAB_STRIP, true);
85 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); 84 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
86 } 85 }
(...skipping 27 matching lines...) Expand all
114 // VIEW_ID_TAB_LAST should always be available. 113 // VIEW_ID_TAB_LAST should always be available.
115 CheckViewID(VIEW_ID_TAB_LAST, true); 114 CheckViewID(VIEW_ID_TAB_LAST, true);
116 } 115 }
117 116
118 // Open the 11th tab. 117 // Open the 11th tab.
119 browser()->OpenURL(OpenURLParams( 118 browser()->OpenURL(OpenURLParams(
120 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, 119 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB,
121 content::PAGE_TRANSITION_TYPED, false)); 120 content::PAGE_TRANSITION_TYPED, false));
122 CheckViewID(VIEW_ID_TAB_LAST, true); 121 CheckViewID(VIEW_ID_TAB_LAST, true);
123 } 122 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698