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

Unified Diff: chrome/browser/ui/touch/frame/touch_browser_frame_view.cc

Issue 6020013: Wrap the virtual keyboard in a container view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: last patch was missing changes Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/touch/frame/touch_browser_frame_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
diff --git a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
index cba63539a98cdb1cbc71161c51383ad1d0edda98..6f891505ee45ca58fb16f95c3fa70c0433211502 100644
--- a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
+++ b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
@@ -4,19 +4,15 @@
#include "chrome/browser/ui/touch/frame/touch_browser_frame_view.h"
-#include <algorithm>
-
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/renderer_host/site_instance.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/views/dom_view.h"
+#include "chrome/browser/ui/touch/frame/keyboard_container_view.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_type.h"
-#include "chrome/common/url_constants.h"
#include "gfx/rect.h"
namespace {
@@ -71,16 +67,10 @@ void TouchBrowserFrameView::InitVirtualKeyboard() {
if (keyboard_)
return;
- keyboard_ = new DOMView;
-
Profile* keyboard_profile = browser_view()->browser()->profile();
DCHECK(keyboard_profile) << "Profile required for virtual keyboard.";
- GURL keyboard_url(chrome::kChromeUIKeyboardURL);
- keyboard_->Init(keyboard_profile,
- SiteInstance::CreateSiteInstanceForURL(keyboard_profile, keyboard_url));
- keyboard_->LoadURL(keyboard_url);
-
+ keyboard_ = new KeyboardContainerView(keyboard_profile);
keyboard_->SetVisible(false);
AddChildView(keyboard_);
}
« no previous file with comments | « chrome/browser/ui/touch/frame/touch_browser_frame_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698