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

Side by Side Diff: ui/aura/demo/demo_main.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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/i18n/icu_util.h" 7 #include "base/i18n/icu_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/power_monitor/power_monitor.h" 10 #include "base/power_monitor/power_monitor.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public: 42 public:
43 explicit DemoWindowDelegate(SkColor color) : color_(color) {} 43 explicit DemoWindowDelegate(SkColor color) : color_(color) {}
44 44
45 // Overridden from WindowDelegate: 45 // Overridden from WindowDelegate:
46 gfx::Size GetMinimumSize() const override { return gfx::Size(); } 46 gfx::Size GetMinimumSize() const override { return gfx::Size(); }
47 47
48 gfx::Size GetMaximumSize() const override { return gfx::Size(); } 48 gfx::Size GetMaximumSize() const override { return gfx::Size(); }
49 49
50 void OnBoundsChanged(const gfx::Rect& old_bounds, 50 void OnBoundsChanged(const gfx::Rect& old_bounds,
51 const gfx::Rect& new_bounds) override {} 51 const gfx::Rect& new_bounds) override {}
52 ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
53 gfx::NativeCursor GetCursor(const gfx::Point& point) override { 52 gfx::NativeCursor GetCursor(const gfx::Point& point) override {
54 return gfx::kNullCursor; 53 return gfx::kNullCursor;
55 } 54 }
56 int GetNonClientComponent(const gfx::Point& point) const override { 55 int GetNonClientComponent(const gfx::Point& point) const override {
57 return HTCAPTION; 56 return HTCAPTION;
58 } 57 }
59 bool ShouldDescendIntoChildForEventHandling( 58 bool ShouldDescendIntoChildForEventHandling(
60 aura::Window* child, 59 aura::Window* child,
61 const gfx::Point& location) override { 60 const gfx::Point& location) override {
62 return true; 61 return true;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 int main(int argc, char** argv) { 189 int main(int argc, char** argv) {
191 base::CommandLine::Init(argc, argv); 190 base::CommandLine::Init(argc, argv);
192 191
193 // The exit manager is in charge of calling the dtors of singleton objects. 192 // The exit manager is in charge of calling the dtors of singleton objects.
194 base::AtExitManager exit_manager; 193 base::AtExitManager exit_manager;
195 194
196 base::i18n::InitializeICU(); 195 base::i18n::InitializeICU();
197 196
198 return DemoMain(); 197 return DemoMain();
199 } 198 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698