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

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

Issue 7111033: Ties up OOBE controllers and WebUI handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 6 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/touch_login_view.h" 5 #include "chrome/browser/chromeos/login/touch_login_view.h"
6 6
7 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" 7 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
8 #include "chrome/browser/ui/touch/frame/keyboard_container_view.h" 8 #include "chrome/browser/ui/touch/frame/keyboard_container_view.h"
9 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h" 9 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
10 #include "chrome/browser/ui/views/dom_view.h" 10 #include "chrome/browser/ui/views/dom_view.h"
(...skipping 27 matching lines...) Expand all
38 TouchLoginView::TouchLoginView() 38 TouchLoginView::TouchLoginView()
39 : WebUILoginView(), 39 : WebUILoginView(),
40 keyboard_showing_(false), 40 keyboard_showing_(false),
41 focus_listener_added_(false), 41 focus_listener_added_(false),
42 keyboard_(NULL) { 42 keyboard_(NULL) {
43 } 43 }
44 44
45 TouchLoginView::~TouchLoginView() { 45 TouchLoginView::~TouchLoginView() {
46 } 46 }
47 47
48 void TouchLoginView::Init(const GURL& login_url) { 48 void TouchLoginView::Init() {
49 WebUILoginView::Init(login_url); 49 WebUILoginView::Init();
50 InitVirtualKeyboard(); 50 InitVirtualKeyboard();
51 51
52 registrar_.Add(this, 52 registrar_.Add(this,
53 NotificationType::FOCUS_CHANGED_IN_PAGE, 53 NotificationType::FOCUS_CHANGED_IN_PAGE,
54 NotificationService::AllSources()); 54 NotificationService::AllSources());
55 registrar_.Add(this, 55 registrar_.Add(this,
56 NotificationType::TAB_CONTENTS_DESTROYED, 56 NotificationType::TAB_CONTENTS_DESTROYED,
57 NotificationService::AllSources()); 57 NotificationService::AllSources());
58 } 58 }
59 59
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // can be determined after tab switching. 148 // can be determined after tab switching.
149 GetFocusedStateAccessor()->SetProperty( 149 GetFocusedStateAccessor()->SetProperty(
150 source_tab->property_bag(), editable); 150 source_tab->property_bag(), editable);
151 } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) { 151 } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
152 GetFocusedStateAccessor()->DeleteProperty( 152 GetFocusedStateAccessor()->DeleteProperty(
153 Source<TabContents>(source).ptr()->property_bag()); 153 Source<TabContents>(source).ptr()->property_bag());
154 } 154 }
155 } 155 }
156 156
157 } // namespace chromeos 157 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/touch_login_view.h ('k') | chrome/browser/chromeos/login/view_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698