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

Side by Side Diff: chrome/browser/chromeos/login/webui_login_view.cc

Issue 7302015: A keyboard widget that manages itself (the animation and all that). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove touch-login-view Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/webui_login_view.h" 5 #include "chrome/browser/chromeos/login/webui_login_view.h"
6 6
7 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" 7 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
8 #include "chrome/browser/chromeos/status/clock_menu_button.h" 8 #include "chrome/browser/chromeos/status/clock_menu_button.h"
9 #include "chrome/browser/chromeos/status/input_method_menu_button.h" 9 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
10 #include "chrome/browser/chromeos/status/network_menu_button.h" 10 #include "chrome/browser/chromeos/status/network_menu_button.h"
11 #include "chrome/browser/chromeos/status/status_area_view.h" 11 #include "chrome/browser/chromeos/status/status_area_view.h"
12 #include "chrome/browser/chromeos/wm_ipc.h" 12 #include "chrome/browser/chromeos/wm_ipc.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/ui/views/dom_view.h" 14 #include "chrome/browser/ui/views/dom_view.h"
15 #include "content/browser/tab_contents/tab_contents.h" 15 #include "content/browser/tab_contents/tab_contents.h"
16 16
17 #if defined(TOUCH_UI)
18 #include "chrome/browser/ui/touch/keyboard/keyboard_manager.h"
19 #endif
20
17 namespace { 21 namespace {
18 22
19 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView"; 23 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView";
20 24
21 } // namespace 25 } // namespace
22 26
23 namespace chromeos { 27 namespace chromeos {
24 28
25 // WebUILoginView public: ------------------------------------------------------ 29 // WebUILoginView public: ------------------------------------------------------
26 30
27 WebUILoginView::WebUILoginView() 31 WebUILoginView::WebUILoginView()
28 : profile_(NULL), 32 : profile_(NULL),
29 status_area_(NULL), 33 status_area_(NULL),
30 webui_login_(NULL) { 34 webui_login_(NULL) {
35 #if defined(TOUCH_UI)
36 // Make sure the singleton KeyboardManager object is created.
37 KeyboardManager::GetInstance();
38 #endif
31 } 39 }
32 40
33 WebUILoginView::~WebUILoginView() { 41 WebUILoginView::~WebUILoginView() {
34 } 42 }
35 43
36 void WebUILoginView::Init() { 44 void WebUILoginView::Init() {
37 profile_ = ProfileManager::GetDefaultProfile(); 45 profile_ = ProfileManager::GetDefaultProfile();
38 46
39 webui_login_ = new DOMView(); 47 webui_login_ = new DOMView();
40 AddChildView(webui_login_); 48 AddChildView(webui_login_);
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 status_area_->Init(); 156 status_area_->Init();
149 AddChildView(status_area_); 157 AddChildView(status_area_);
150 } 158 }
151 159
152 bool WebUILoginView::HandleContextMenu(const ContextMenuParams& params) { 160 bool WebUILoginView::HandleContextMenu(const ContextMenuParams& params) {
153 // Do not show the context menu. 161 // Do not show the context menu.
154 return true; 162 return true;
155 } 163 }
156 164
157 } // namespace chromeos 165 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698