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

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

Issue 6976040: Revert 86914 - Move a bunch of functions from Window onto Widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/eula_view.cc » ('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) 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/background_view.h" 5 #include "chrome/browser/chromeos/login/background_view.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 gdk_window_set_back_pixmap(gdk_window, NULL, false); 145 gdk_window_set_back_pixmap(gdk_window, NULL, false);
146 146
147 LoginUtils::Get()->SetBackgroundView(*view); 147 LoginUtils::Get()->SetBackgroundView(*view);
148 148
149 return window; 149 return window;
150 } 150 }
151 151
152 void BackgroundView::CreateModalPopup(views::WindowDelegate* view) { 152 void BackgroundView::CreateModalPopup(views::WindowDelegate* view) {
153 views::Window* window = browser::CreateViewsWindow( 153 views::Window* window = browser::CreateViewsWindow(
154 GetNativeWindow(), gfx::Rect(), view); 154 GetNativeWindow(), gfx::Rect(), view);
155 window->SetAlwaysOnTop(true); 155 window->SetIsAlwaysOnTop(true);
156 window->Show(); 156 window->Show();
157 } 157 }
158 158
159 gfx::NativeWindow BackgroundView::GetNativeWindow() const { 159 gfx::NativeWindow BackgroundView::GetNativeWindow() const {
160 return GetWidget()->GetNativeWindow(); 160 return GetWidget()->GetNativeWindow();
161 } 161 }
162 162
163 void BackgroundView::SetStatusAreaVisible(bool visible) { 163 void BackgroundView::SetStatusAreaVisible(bool visible) {
164 status_area_->SetVisible(visible); 164 status_area_->SetVisible(visible);
165 } 165 }
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 boot_times_label_->SetText(ASCIIToWide(boot_times_text)); 510 boot_times_label_->SetText(ASCIIToWide(boot_times_text));
511 } 511 }
512 512
513 void BackgroundView::OnPolicyStateChanged( 513 void BackgroundView::OnPolicyStateChanged(
514 policy::CloudPolicySubsystem::PolicySubsystemState state, 514 policy::CloudPolicySubsystem::PolicySubsystemState state,
515 policy::CloudPolicySubsystem::ErrorDetails error_details) { 515 policy::CloudPolicySubsystem::ErrorDetails error_details) {
516 UpdateEnterpriseInfo(); 516 UpdateEnterpriseInfo();
517 } 517 }
518 518
519 } // namespace chromeos 519 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/eula_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698