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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 860983004: text input focus: Supports Window::GetFocusedTextInputClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 unified diff | Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.h ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 aura::client::kConstrainedWindowKey)) { 1428 aura::client::kConstrainedWindowKey)) {
1429 gfx::Rect bounds = window_->children()[i]->bounds(); 1429 gfx::Rect bounds = window_->children()[i]->bounds();
1430 bounds.set_origin( 1430 bounds.set_origin(
1431 gfx::Point((new_bounds.width() - bounds.width()) / 2, 1431 gfx::Point((new_bounds.width() - bounds.width()) / 2,
1432 (new_bounds.height() - bounds.height()) / 2)); 1432 (new_bounds.height() - bounds.height()) / 2));
1433 window_->children()[i]->SetBounds(bounds); 1433 window_->children()[i]->SetBounds(bounds);
1434 } 1434 }
1435 } 1435 }
1436 } 1436 }
1437 1437
1438 ui::TextInputClient* WebContentsViewAura::GetFocusedTextInputClient() {
1439 return nullptr;
1440 }
1441
1438 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) { 1442 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) {
1439 return gfx::kNullCursor; 1443 return gfx::kNullCursor;
1440 } 1444 }
1441 1445
1442 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const { 1446 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const {
1443 return HTCLIENT; 1447 return HTCLIENT;
1444 } 1448 }
1445 1449
1446 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling( 1450 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling(
1447 aura::Window* child, 1451 aura::Window* child,
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 if (visible) { 1637 if (visible) {
1634 if (!web_contents_->should_normally_be_visible()) 1638 if (!web_contents_->should_normally_be_visible())
1635 web_contents_->WasShown(); 1639 web_contents_->WasShown();
1636 } else { 1640 } else {
1637 if (web_contents_->should_normally_be_visible()) 1641 if (web_contents_->should_normally_be_visible())
1638 web_contents_->WasHidden(); 1642 web_contents_->WasHidden();
1639 } 1643 }
1640 } 1644 }
1641 1645
1642 } // namespace content 1646 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.h ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698