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

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

Issue 641553002: Revert of Remove PagePopup runtime flag (status=stable) for blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | Source/web/WebRuntimeFeatures.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "core/page/PagePopupDriver.h" 55 #include "core/page/PagePopupDriver.h"
56 #include "core/page/WindowFeatures.h" 56 #include "core/page/WindowFeatures.h"
57 #include "core/rendering/HitTestResult.h" 57 #include "core/rendering/HitTestResult.h"
58 #include "core/rendering/RenderPart.h" 58 #include "core/rendering/RenderPart.h"
59 #include "core/rendering/RenderWidget.h" 59 #include "core/rendering/RenderWidget.h"
60 #include "core/rendering/compositing/CompositedSelectionBound.h" 60 #include "core/rendering/compositing/CompositedSelectionBound.h"
61 #include "platform/Cursor.h" 61 #include "platform/Cursor.h"
62 #include "platform/FileChooser.h" 62 #include "platform/FileChooser.h"
63 #include "platform/NotImplemented.h" 63 #include "platform/NotImplemented.h"
64 #include "platform/PlatformScreen.h" 64 #include "platform/PlatformScreen.h"
65 #include "platform/RuntimeEnabledFeatures.h"
65 #include "platform/exported/WrappedResourceRequest.h" 66 #include "platform/exported/WrappedResourceRequest.h"
66 #include "platform/geometry/FloatRect.h" 67 #include "platform/geometry/FloatRect.h"
67 #include "platform/geometry/IntRect.h" 68 #include "platform/geometry/IntRect.h"
68 #include "platform/graphics/GraphicsLayer.h" 69 #include "platform/graphics/GraphicsLayer.h"
69 #include "platform/weborigin/SecurityOrigin.h" 70 #include "platform/weborigin/SecurityOrigin.h"
70 #include "public/platform/Platform.h" 71 #include "public/platform/Platform.h"
71 #include "public/platform/WebCursorInfo.h" 72 #include "public/platform/WebCursorInfo.h"
72 #include "public/platform/WebRect.h" 73 #include "public/platform/WebRect.h"
73 #include "public/platform/WebSelectionBound.h" 74 #include "public/platform/WebSelectionBound.h"
74 #include "public/platform/WebURLRequest.h" 75 #include "public/platform/WebURLRequest.h"
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 575
575 void ChromeClientImpl::print(LocalFrame* frame) 576 void ChromeClientImpl::print(LocalFrame* frame)
576 { 577 {
577 if (m_webView->client()) 578 if (m_webView->client())
578 m_webView->client()->printPage(WebLocalFrameImpl::fromFrame(frame)); 579 m_webView->client()->printPage(WebLocalFrameImpl::fromFrame(frame));
579 } 580 }
580 581
581 PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(LocalFrame* frame, ColorChooserClient* chooserClient, const Color&) 582 PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(LocalFrame* frame, ColorChooserClient* chooserClient, const Color&)
582 { 583 {
583 OwnPtr<ColorChooserUIController> controller; 584 OwnPtr<ColorChooserUIController> controller;
584 585 if (RuntimeEnabledFeatures::pagePopupEnabled())
585 controller = adoptPtr(new ColorChooserPopupUIController(frame, this, chooser Client)); 586 controller = adoptPtr(new ColorChooserPopupUIController(frame, this, cho oserClient));
587 else
588 controller = adoptPtr(new ColorChooserUIController(frame, chooserClient) );
586 controller->openUI(); 589 controller->openUI();
587 return controller.release(); 590 return controller.release();
588 } 591 }
589 592
590 PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChoose rClient* pickerClient, const DateTimeChooserParameters& parameters) 593 PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChoose rClient* pickerClient, const DateTimeChooserParameters& parameters)
591 { 594 {
592 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) 595 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
593 return DateTimeChooserImpl::create(this, pickerClient, parameters); 596 return DateTimeChooserImpl::create(this, pickerClient, parameters);
594 #else 597 #else
595 return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClie nt, parameters); 598 return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClie nt, parameters);
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inp utElement)); 888 m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inp utElement));
886 } 889 }
887 890
888 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input) 891 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input)
889 { 892 {
890 if (m_webView->autofillClient()) 893 if (m_webView->autofillClient())
891 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in put)); 894 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in put));
892 } 895 }
893 896
894 } // namespace blink 897 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | Source/web/WebRuntimeFeatures.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698