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

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

Issue 2762014: Mac: clang build (Closed)
Patch Set: more Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/autocomplete/autocomplete_popup_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 720f3ac41a7dfa78b4a3c92b136d87d45f9e2c0d..cb4145aa7e52201d93f55b8b69833c36be909b3b 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -55,7 +55,7 @@ namespace {
// TODO(shess): This is ugly, find a better way. Using it right now
// so that I can crib from gtk and still be able to see that I'm using
// the same values easily.
-const NSColor* ColorWithRGBBytes(int rr, int gg, int bb) {
+NSColor* ColorWithRGBBytes(int rr, int gg, int bb) {
DCHECK_LE(rr, 255);
DCHECK_LE(bb, 255);
DCHECK_LE(gg, 255);
@@ -65,19 +65,19 @@ const NSColor* ColorWithRGBBytes(int rr, int gg, int bb) {
alpha:1.0];
}
-const NSColor* HostTextColor() {
+NSColor* HostTextColor() {
return [NSColor blackColor];
}
-const NSColor* BaseTextColor() {
+NSColor* BaseTextColor() {
return [NSColor darkGrayColor];
}
-const NSColor* EVSecureSchemeColor() {
+NSColor* EVSecureSchemeColor() {
return ColorWithRGBBytes(0x07, 0x95, 0x00);
}
-const NSColor* SecureSchemeColor() {
+NSColor* SecureSchemeColor() {
return ColorWithRGBBytes(0x00, 0x0e, 0x95);
}
-const NSColor* SecurityErrorSchemeColor() {
+NSColor* SecurityErrorSchemeColor() {
return ColorWithRGBBytes(0xa2, 0x00, 0x00);
}
@@ -878,7 +878,8 @@ void AutocompleteEditViewMac::FocusLocation(bool select_all) {
// call it if this behavior is desired.
if (select_all || ![field_ currentEditor])
[[field_ window] makeFirstResponder:field_];
- DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]);
+// FIXME
+ DCHECK_EQ((id)[field_ currentEditor], (id)[[field_ window] firstResponder]);
}
}
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/autocomplete/autocomplete_popup_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698