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

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

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) 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 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 25
26 #include "config.h" 26 #include "config.h"
27 #include "ColorChooserPopupUIController.h" 27 #include "ColorChooserPopupUIController.h"
28 28
29 #if ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) 29 #if ENABLE(INPUT_TYPE_COLOR)
30 #include "ChromeClientImpl.h" 30 #include "ChromeClientImpl.h"
31 #include "ColorSuggestionPicker.h" 31 #include "ColorSuggestionPicker.h"
32 #include "PickerCommon.h" 32 #include "PickerCommon.h"
33 #include "WebColorChooser.h" 33 #include "WebColorChooser.h"
34 #include "WebViewImpl.h" 34 #include "WebViewImpl.h"
35 #include "core/page/FrameView.h" 35 #include "core/page/FrameView.h"
36 #include "core/platform/ColorChooserClient.h" 36 #include "core/platform/ColorChooserClient.h"
37 #include "core/platform/LocalizedStrings.h" 37 #include "core/platform/LocalizedStrings.h"
38 #include "core/platform/graphics/IntRect.h" 38 #include "core/platform/graphics/IntRect.h"
39 #include <public/Platform.h> 39 #include <public/Platform.h>
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 } 144 }
145 145
146 void ColorChooserPopupUIController::closePopup() 146 void ColorChooserPopupUIController::closePopup()
147 { 147 {
148 if (!m_popup) 148 if (!m_popup)
149 return; 149 return;
150 m_chromeClient->closePagePopup(m_popup); 150 m_chromeClient->closePagePopup(m_popup);
151 } 151 }
152 152
153 } 153 }
154 #endif // ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) 154 #endif // ENABLE(INPUT_TYPE_COLOR)
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/ColorChooserPopupUIController.h ('k') | Source/WebKit/chromium/src/WebPagePopupImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698