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

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

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/webview/webview.h ('k') | ui/views/ime/OWNERS » ('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 #include "ui/views/controls/webview/webview.h" 5 #include "ui/views/controls/webview/webview.h"
6 6
7 #include "content/public/browser/browser_accessibility_state.h" 7 #include "content/public/browser/browser_accessibility_state.h"
8 #include "content/public/browser/browser_context.h" 8 #include "content/public/browser/browser_context.h"
9 #include "content/public/browser/navigation_controller.h" 9 #include "content/public/browser/navigation_controller.h"
10 #include "content/public/browser/render_process_host.h" 10 #include "content/public/browser/render_process_host.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 PreferredSizeChanged(); 102 PreferredSizeChanged();
103 } 103 }
104 104
105 //////////////////////////////////////////////////////////////////////////////// 105 ////////////////////////////////////////////////////////////////////////////////
106 // WebView, View overrides: 106 // WebView, View overrides:
107 107
108 const char* WebView::GetClassName() const { 108 const char* WebView::GetClassName() const {
109 return kViewClassName; 109 return kViewClassName;
110 } 110 }
111 111
112 ui::TextInputClient* WebView::GetTextInputClient() {
113 return NULL;
114 }
115
116 scoped_ptr<content::WebContents> WebView::SwapWebContents( 112 scoped_ptr<content::WebContents> WebView::SwapWebContents(
117 scoped_ptr<content::WebContents> new_web_contents) { 113 scoped_ptr<content::WebContents> new_web_contents) {
118 if (wc_owner_) 114 if (wc_owner_)
119 wc_owner_->SetDelegate(NULL); 115 wc_owner_->SetDelegate(NULL);
120 scoped_ptr<content::WebContents> old_web_contents(wc_owner_.Pass()); 116 scoped_ptr<content::WebContents> old_web_contents(wc_owner_.Pass());
121 wc_owner_ = new_web_contents.Pass(); 117 wc_owner_ = new_web_contents.Pass();
122 if (wc_owner_) 118 if (wc_owner_)
123 wc_owner_->SetDelegate(this); 119 wc_owner_->SetDelegate(this);
124 SetWebContents(wc_owner_.get()); 120 SetWebContents(wc_owner_.get());
125 return old_web_contents.Pass(); 121 return old_web_contents.Pass();
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 if (!contents) { 390 if (!contents) {
395 content::WebContents::CreateParams create_params( 391 content::WebContents::CreateParams create_params(
396 browser_context, NULL); 392 browser_context, NULL);
397 return content::WebContents::Create(create_params); 393 return content::WebContents::Create(create_params);
398 } 394 }
399 395
400 return contents; 396 return contents;
401 } 397 }
402 398
403 } // namespace views 399 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/webview/webview.h ('k') | ui/views/ime/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698