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

Side by Side Diff: Source/web/DateTimeChooserImpl.cpp

Issue 52553008: Eliminate the CALENDAR_PICKER compile time flag as only android uses this flag and the web facing p… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Fix winbot by eliminating last checks for CALENDAR_PICKER Created 7 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 26 matching lines...) Expand all
37 #include "PickerCommon.h" 37 #include "PickerCommon.h"
38 #include "WebViewImpl.h" 38 #include "WebViewImpl.h"
39 #include "core/html/forms/InputTypeNames.h" 39 #include "core/html/forms/InputTypeNames.h"
40 #include "core/frame/FrameView.h" 40 #include "core/frame/FrameView.h"
41 #include "core/rendering/RenderTheme.h" 41 #include "core/rendering/RenderTheme.h"
42 #include "platform/DateComponents.h" 42 #include "platform/DateComponents.h"
43 #include "platform/DateTimeChooserClient.h" 43 #include "platform/DateTimeChooserClient.h"
44 #include "platform/Language.h" 44 #include "platform/Language.h"
45 #include "platform/text/PlatformLocale.h" 45 #include "platform/text/PlatformLocale.h"
46 46
47 #if !ENABLE(CALENDAR_PICKER)
48 #error "ENABLE_INPUT_MULTIPLE_FIELDS_UI requires ENABLE_CALENDAR_PICKER in Chrom ium."
49 #endif
50
51 using namespace WebCore; 47 using namespace WebCore;
52 48
53 namespace WebKit { 49 namespace WebKit {
54 50
55 DateTimeChooserImpl::DateTimeChooserImpl(ChromeClientImpl* chromeClient, WebCore ::DateTimeChooserClient* client, const WebCore::DateTimeChooserParameters& param eters) 51 DateTimeChooserImpl::DateTimeChooserImpl(ChromeClientImpl* chromeClient, WebCore ::DateTimeChooserClient* client, const WebCore::DateTimeChooserParameters& param eters)
56 : m_chromeClient(chromeClient) 52 : m_chromeClient(chromeClient)
57 , m_client(client) 53 , m_client(client)
58 , m_popup(0) 54 , m_popup(0)
59 , m_parameters(parameters) 55 , m_parameters(parameters)
60 , m_locale(WebCore::Locale::create(parameters.locale)) 56 , m_locale(WebCore::Locale::create(parameters.locale))
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 void DateTimeChooserImpl::didClosePopup() 179 void DateTimeChooserImpl::didClosePopup()
184 { 180 {
185 ASSERT(m_client); 181 ASSERT(m_client);
186 m_popup = 0; 182 m_popup = 0;
187 m_client->didEndChooser(); 183 m_client->didEndChooser();
188 } 184 }
189 185
190 } // namespace WebKit 186 } // namespace WebKit
191 187
192 #endif // ENABLE(INPUT_MULTIPLE_FIELDS_UI) 188 #endif // ENABLE(INPUT_MULTIPLE_FIELDS_UI)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698