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

Side by Side Diff: ui/keyboard/keyboard_controller_proxy.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 | « ui/keyboard/keyboard_controller.cc ('k') | ui/keyboard/keyboard_controller_proxy.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) 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 #ifndef UI_KEYBOARD_KEYBOARD_CONTROLLER_PROXY_H_ 5 #ifndef UI_KEYBOARD_KEYBOARD_CONTROLLER_PROXY_H_
6 #define UI_KEYBOARD_KEYBOARD_CONTROLLER_PROXY_H_ 6 #define UI_KEYBOARD_KEYBOARD_CONTROLLER_PROXY_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/public/common/media_stream_request.h" 9 #include "content/public/common/media_stream_request.h"
10 #include "ui/aura/window_observer.h" 10 #include "ui/aura/window_observer.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 // The implementation can choose to setup the WebContents before the virtual 109 // The implementation can choose to setup the WebContents before the virtual
110 // keyboard page is loaded (e.g. install a WebContentsObserver). 110 // keyboard page is loaded (e.g. install a WebContentsObserver).
111 // SetupWebContents() is called right after creating the WebContents, before 111 // SetupWebContents() is called right after creating the WebContents, before
112 // loading the keyboard page. 112 // loading the keyboard page.
113 virtual void SetupWebContents(content::WebContents* contents); 113 virtual void SetupWebContents(content::WebContents* contents);
114 114
115 // aura::WindowObserver overrides: 115 // aura::WindowObserver overrides:
116 virtual void OnWindowBoundsChanged(aura::Window* window, 116 virtual void OnWindowBoundsChanged(aura::Window* window,
117 const gfx::Rect& old_bounds, 117 const gfx::Rect& old_bounds,
118 const gfx::Rect& new_bounds) OVERRIDE; 118 const gfx::Rect& new_bounds) override;
119 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 119 virtual void OnWindowDestroyed(aura::Window* window) override;
120 120
121 private: 121 private:
122 friend class TestApi; 122 friend class TestApi;
123 123
124 // Loads the web contents for the given |url|. 124 // Loads the web contents for the given |url|.
125 void LoadContents(const GURL& url); 125 void LoadContents(const GURL& url);
126 126
127 // Gets the virtual keyboard URL (either the default URL or IME override URL). 127 // Gets the virtual keyboard URL (either the default URL or IME override URL).
128 const GURL& GetVirtualKeyboardUrl(); 128 const GURL& GetVirtualKeyboardUrl();
129 129
130 const GURL default_url_; 130 const GURL default_url_;
131 131
132 scoped_ptr<content::WebContents> keyboard_contents_; 132 scoped_ptr<content::WebContents> keyboard_contents_;
133 scoped_ptr<wm::Shadow> shadow_; 133 scoped_ptr<wm::Shadow> shadow_;
134 134
135 DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxy); 135 DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxy);
136 }; 136 };
137 137
138 } // namespace keyboard 138 } // namespace keyboard
139 139
140 #endif // UI_KEYBOARD_KEYBOARD_CONTROLLER_PROXY_H_ 140 #endif // UI_KEYBOARD_KEYBOARD_CONTROLLER_PROXY_H_
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard_controller.cc ('k') | ui/keyboard/keyboard_controller_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698