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

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

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased & removed views::View::GetTextInputClient & removed GetFocusedTextInputClient. Created 5 years, 6 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 // 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/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1116 aura::client::kConstrainedWindowKey)) { 1116 aura::client::kConstrainedWindowKey)) {
1117 gfx::Rect bounds = window_->children()[i]->bounds(); 1117 gfx::Rect bounds = window_->children()[i]->bounds();
1118 bounds.set_origin( 1118 bounds.set_origin(
1119 gfx::Point((new_bounds.width() - bounds.width()) / 2, 1119 gfx::Point((new_bounds.width() - bounds.width()) / 2,
1120 (new_bounds.height() - bounds.height()) / 2)); 1120 (new_bounds.height() - bounds.height()) / 2));
1121 window_->children()[i]->SetBounds(bounds); 1121 window_->children()[i]->SetBounds(bounds);
1122 } 1122 }
1123 } 1123 }
1124 } 1124 }
1125 1125
1126 ui::TextInputClient* WebContentsViewAura::GetFocusedTextInputClient() {
1127 return nullptr;
1128 }
1129
1130 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) { 1126 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) {
1131 return gfx::kNullCursor; 1127 return gfx::kNullCursor;
1132 } 1128 }
1133 1129
1134 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const { 1130 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const {
1135 return HTCLIENT; 1131 return HTCLIENT;
1136 } 1132 }
1137 1133
1138 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling( 1134 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling(
1139 aura::Window* child, 1135 aura::Window* child,
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1324 if (visible) { 1320 if (visible) {
1325 if (!web_contents_->should_normally_be_visible()) 1321 if (!web_contents_->should_normally_be_visible())
1326 web_contents_->WasShown(); 1322 web_contents_->WasShown();
1327 } else { 1323 } else {
1328 if (web_contents_->should_normally_be_visible()) 1324 if (web_contents_->should_normally_be_visible())
1329 web_contents_->WasHidden(); 1325 web_contents_->WasHidden();
1330 } 1326 }
1331 } 1327 }
1332 1328
1333 } // namespace content 1329 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698