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

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

Issue 7111033: Ties up OOBE controllers and WebUI handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits 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/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 16
16 namespace { 17 namespace {
17 18
18 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView"; 19 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView";
19 20
20 } // namespace 21 } // namespace
21 22
22 namespace chromeos { 23 namespace chromeos {
23 24
24 // WebUILoginView public: ------------------------------------------------------ 25 // WebUILoginView public: ------------------------------------------------------
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 66 }
66 67
67 void WebUILoginView::UpdateWindowType() { 68 void WebUILoginView::UpdateWindowType() {
68 std::vector<int> params; 69 std::vector<int> params;
69 WmIpc::instance()->SetWindowType( 70 WmIpc::instance()->SetWindowType(
70 GTK_WIDGET(GetNativeWindow()), 71 GTK_WIDGET(GetNativeWindow()),
71 WM_IPC_WINDOW_LOGIN_WEBUI, 72 WM_IPC_WINDOW_LOGIN_WEBUI,
72 &params); 73 &params);
73 } 74 }
74 75
76 WebUI* WebUILoginView::GetWebUI() {
77 return webui_login_->tab_contents()->web_ui();
78 }
79
75 // WebUILoginView protected: --------------------------------------------------- 80 // WebUILoginView protected: ---------------------------------------------------
76 81
77 void WebUILoginView::Layout() { 82 void WebUILoginView::Layout() {
78 DCHECK(webui_login_); 83 DCHECK(webui_login_);
79 DCHECK(status_area_); 84 DCHECK(status_area_);
80 85
81 // Layout the Status Area up in the right corner. This should always be done. 86 // Layout the Status Area up in the right corner. This should always be done.
82 const int kCornerPadding = 5; 87 const int kCornerPadding = 5;
83 gfx::Size status_area_size = status_area_->GetPreferredSize(); 88 gfx::Size status_area_size = status_area_->GetPreferredSize();
84 status_area_->SetBounds( 89 status_area_->SetBounds(
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 // WebUILoginView private: ----------------------------------------------------- 141 // WebUILoginView private: -----------------------------------------------------
137 142
138 void WebUILoginView::InitStatusArea() { 143 void WebUILoginView::InitStatusArea() {
139 DCHECK(status_area_ == NULL); 144 DCHECK(status_area_ == NULL);
140 status_area_ = new StatusAreaView(this); 145 status_area_ = new StatusAreaView(this);
141 status_area_->Init(); 146 status_area_->Init();
142 AddChildView(status_area_); 147 AddChildView(status_area_);
143 } 148 }
144 149
145 } // namespace chromeos 150 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698