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

Side by Side Diff: ui/aura_extra/image_window_delegate.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/aura_extra/image_window_delegate.h" 5 #include "ui/aura_extra/image_window_delegate.h"
6 6
7 #include "ui/base/cursor/cursor.h" 7 #include "ui/base/cursor/cursor.h"
8 #include "ui/base/hit_test.h" 8 #include "ui/base/hit_test.h"
9 #include "ui/compositor/compositor.h" 9 #include "ui/compositor/compositor.h"
10 #include "ui/compositor/paint_recorder.h" 10 #include "ui/compositor/paint_recorder.h"
(...skipping 27 matching lines...) Expand all
38 return gfx::Size(); 38 return gfx::Size();
39 } 39 }
40 40
41 void ImageWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds, 41 void ImageWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds,
42 const gfx::Rect& new_bounds) { 42 const gfx::Rect& new_bounds) {
43 window_size_ = new_bounds.size(); 43 window_size_ = new_bounds.size();
44 if (!image_.IsEmpty()) 44 if (!image_.IsEmpty())
45 size_mismatch_ = window_size_ != image_.AsImageSkia().size(); 45 size_mismatch_ = window_size_ != image_.AsImageSkia().size();
46 } 46 }
47 47
48 ui::TextInputClient* ImageWindowDelegate::GetFocusedTextInputClient() {
49 return nullptr;
50 }
51
52 gfx::NativeCursor ImageWindowDelegate::GetCursor(const gfx::Point& point) { 48 gfx::NativeCursor ImageWindowDelegate::GetCursor(const gfx::Point& point) {
53 return gfx::kNullCursor; 49 return gfx::kNullCursor;
54 } 50 }
55 51
56 int ImageWindowDelegate::GetNonClientComponent(const gfx::Point& point) const { 52 int ImageWindowDelegate::GetNonClientComponent(const gfx::Point& point) const {
57 return HTNOWHERE; 53 return HTNOWHERE;
58 } 54 }
59 55
60 bool ImageWindowDelegate::ShouldDescendIntoChildForEventHandling( 56 bool ImageWindowDelegate::ShouldDescendIntoChildForEventHandling(
61 aura::Window* child, 57 aura::Window* child,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 92 }
97 93
98 bool ImageWindowDelegate::HasHitTestMask() const { 94 bool ImageWindowDelegate::HasHitTestMask() const {
99 return false; 95 return false;
100 } 96 }
101 97
102 void ImageWindowDelegate::GetHitTestMask(gfx::Path* mask) const { 98 void ImageWindowDelegate::GetHitTestMask(gfx::Path* mask) const {
103 } 99 }
104 100
105 } // namespace aura_extra 101 } // namespace aura_extra
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698