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

Side by Side Diff: Source/WebKit/chromium/src/ColorChooserPopupUIController.h

Issue 14735003: Remove compile time flag ENABLE_PAGE_POPUP . This is part of an overall effort to remove unneeded c… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 7 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 #ifndef ColorChooserPopupUIController_h 25 #ifndef ColorChooserPopupUIController_h
26 #define ColorChooserPopupUIController_h 26 #define ColorChooserPopupUIController_h
27 27
28 #if ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) 28 #if ENABLE(INPUT_TYPE_COLOR)
29 #include "ColorChooserUIController.h" 29 #include "ColorChooserUIController.h"
30 #include "core/page/PagePopupClient.h" 30 #include "core/page/PagePopupClient.h"
31 #include <wtf/OwnPtr.h> 31 #include <wtf/OwnPtr.h>
32 32
33 namespace WebCore { 33 namespace WebCore {
34 class ColorChooserClient; 34 class ColorChooserClient;
35 class PagePopup; 35 class PagePopup;
36 } 36 }
37 37
38 namespace WebKit { 38 namespace WebKit {
(...skipping 22 matching lines...) Expand all
61 private: 61 private:
62 void openPopup(); 62 void openPopup();
63 63
64 ChromeClientImpl* m_chromeClient; 64 ChromeClientImpl* m_chromeClient;
65 WebCore::ColorChooserClient* m_client; 65 WebCore::ColorChooserClient* m_client;
66 WebCore::PagePopup* m_popup; 66 WebCore::PagePopup* m_popup;
67 OwnPtr<WebCore::Locale> m_locale; 67 OwnPtr<WebCore::Locale> m_locale;
68 }; 68 };
69 } 69 }
70 70
71 #endif // ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) 71 #endif // ENABLE(INPUT_TYPE_COLOR)
72 72
73 #endif // ColorChooserPopupUIController_h 73 #endif // ColorChooserPopupUIController_h
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/ChromeClientImpl.cpp ('k') | Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698