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

Unified Diff: sky/engine/core/page/FocusController.cpp

Issue 878673005: Get rid of Chrome, use Page. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « sky/engine/core/page/EventHandler.cpp ('k') | sky/engine/core/page/Page.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/page/FocusController.cpp
diff --git a/sky/engine/core/page/FocusController.cpp b/sky/engine/core/page/FocusController.cpp
index 75df78eaedbcda2f7153f79ddc26b2441fb450f3..3ca343301c5d2578d4715cd64abe303d0fecc15b 100644
--- a/sky/engine/core/page/FocusController.cpp
+++ b/sky/engine/core/page/FocusController.cpp
@@ -44,7 +44,6 @@
#include "sky/engine/core/frame/LocalFrame.h"
#include "sky/engine/core/frame/Settings.h"
#include "sky/engine/core/html/HTMLImageElement.h"
-#include "sky/engine/core/page/Chrome.h"
#include "sky/engine/core/page/ChromeClient.h"
#include "sky/engine/core/page/EventHandler.h"
#include "sky/engine/core/page/Page.h"
@@ -216,7 +215,7 @@ void FocusController::setFocusedFrame(PassRefPtr<LocalFrame> frame)
m_isChangingFocusedFrame = false;
- m_page->chrome().client().focusedFrameChanged(newFrame.get());
+ m_page->focusedFrameChanged(newFrame.get());
}
void FocusController::focusDocumentView(PassRefPtr<LocalFrame> frame)
@@ -326,10 +325,10 @@ bool FocusController::advanceFocusInDocumentOrder(FocusType type, bool initialFo
if (!node) {
// We didn't find a node to focus, so we should try to pass focus to Chrome.
- if (!initialFocus && m_page->chrome().canTakeFocus(type)) {
+ if (!initialFocus && m_page->canTakeFocus(type)) {
document->setFocusedElement(nullptr);
setFocusedFrame(nullptr);
- m_page->chrome().takeFocus(type);
+ m_page->takeFocus(type);
return true;
}
@@ -554,8 +553,6 @@ bool FocusController::setFocusedElement(Element* element, PassRefPtr<LocalFrame>
if (oldFocusedElement && oldFocusedElement->isRootEditableElement() && !relinquishesEditingFocus(oldFocusedElement))
return false;
- m_page->chrome().client().willSetInputMethodState();
-
RefPtr<Document> newDocument = nullptr;
if (element)
newDocument = &element->document();
« no previous file with comments | « sky/engine/core/page/EventHandler.cpp ('k') | sky/engine/core/page/Page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698