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

Side by Side Diff: ui/views/controls/webview/webview.h

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. Created 5 years, 5 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/views/controls/tree/tree_view_unittest.cc ('k') | ui/views/controls/webview/webview.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) 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 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/render_process_host_observer.h" 10 #include "content/public/browser/render_process_host_observer.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 void set_allow_accelerators(bool allow_accelerators) { 83 void set_allow_accelerators(bool allow_accelerators) {
84 allow_accelerators_ = allow_accelerators; 84 allow_accelerators_ = allow_accelerators;
85 } 85 }
86 86
87 // Sets the preferred size. If empty, View's implementation of 87 // Sets the preferred size. If empty, View's implementation of
88 // GetPreferredSize() is used. 88 // GetPreferredSize() is used.
89 void SetPreferredSize(const gfx::Size& preferred_size); 89 void SetPreferredSize(const gfx::Size& preferred_size);
90 90
91 // Overridden from View: 91 // Overridden from View:
92 const char* GetClassName() const override; 92 const char* GetClassName() const override;
93 ui::TextInputClient* GetTextInputClient() override;
94 93
95 protected: 94 protected:
96 // Swaps the owned WebContents |wc_owner_| with |new_web_contents|. Returns 95 // Swaps the owned WebContents |wc_owner_| with |new_web_contents|. Returns
97 // the previously owned WebContents. 96 // the previously owned WebContents.
98 scoped_ptr<content::WebContents> SwapWebContents( 97 scoped_ptr<content::WebContents> SwapWebContents(
99 scoped_ptr<content::WebContents> new_web_contents); 98 scoped_ptr<content::WebContents> new_web_contents);
100 99
101 // Overridden from View: 100 // Overridden from View:
102 void OnBoundsChanged(const gfx::Rect& previous_bounds) override; 101 void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
103 void ViewHierarchyChanged( 102 void ViewHierarchyChanged(
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 content::BrowserContext* browser_context_; 166 content::BrowserContext* browser_context_;
168 bool allow_accelerators_; 167 bool allow_accelerators_;
169 gfx::Size preferred_size_; 168 gfx::Size preferred_size_;
170 169
171 DISALLOW_COPY_AND_ASSIGN(WebView); 170 DISALLOW_COPY_AND_ASSIGN(WebView);
172 }; 171 };
173 172
174 } // namespace views 173 } // namespace views
175 174
176 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 175 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/tree/tree_view_unittest.cc ('k') | ui/views/controls/webview/webview.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698