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

Side by Side Diff: ash/drag_drop/drag_drop_controller.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 "ash/drag_drop/drag_drop_controller.h" 5 #include "ash/drag_drop/drag_drop_controller.h"
6 6
7 #include "ash/drag_drop/drag_drop_tracker.h" 7 #include "ash/drag_drop/drag_drop_tracker.h"
8 #include "ash/drag_drop/drag_image_view.h" 8 #include "ash/drag_drop/drag_image_view.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 : drag_drop_controller_(controller) {} 80 : drag_drop_controller_(controller) {}
81 ~DragDropTrackerDelegate() override {} 81 ~DragDropTrackerDelegate() override {}
82 82
83 // Overridden from WindowDelegate: 83 // Overridden from WindowDelegate:
84 gfx::Size GetMinimumSize() const override { return gfx::Size(); } 84 gfx::Size GetMinimumSize() const override { return gfx::Size(); }
85 85
86 gfx::Size GetMaximumSize() const override { return gfx::Size(); } 86 gfx::Size GetMaximumSize() const override { return gfx::Size(); }
87 87
88 void OnBoundsChanged(const gfx::Rect& old_bounds, 88 void OnBoundsChanged(const gfx::Rect& old_bounds,
89 const gfx::Rect& new_bounds) override {} 89 const gfx::Rect& new_bounds) override {}
90 ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
91 gfx::NativeCursor GetCursor(const gfx::Point& point) override { 90 gfx::NativeCursor GetCursor(const gfx::Point& point) override {
92 return gfx::kNullCursor; 91 return gfx::kNullCursor;
93 } 92 }
94 int GetNonClientComponent(const gfx::Point& point) const override { 93 int GetNonClientComponent(const gfx::Point& point) const override {
95 return HTCAPTION; 94 return HTCAPTION;
96 } 95 }
97 bool ShouldDescendIntoChildForEventHandling( 96 bool ShouldDescendIntoChildForEventHandling(
98 aura::Window* child, 97 aura::Window* child,
99 const gfx::Point& location) override { 98 const gfx::Point& location) override {
100 return true; 99 return true;
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 if (drag_window_) 559 if (drag_window_)
561 drag_window_->RemoveObserver(this); 560 drag_window_->RemoveObserver(this);
562 drag_window_ = NULL; 561 drag_window_ = NULL;
563 drag_data_ = NULL; 562 drag_data_ = NULL;
564 // Cleanup can be called again while deleting DragDropTracker, so delete 563 // Cleanup can be called again while deleting DragDropTracker, so delete
565 // the pointer with a local variable to avoid double free. 564 // the pointer with a local variable to avoid double free.
566 scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass(); 565 scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass();
567 } 566 }
568 567
569 } // namespace ash 568 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698