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

Unified Diff: chrome/browser/chromeos/status/network_menu_button.cc

Issue 8513007: [cros] Use LoginDisplayHost::GetNativeWindow() for status area on login screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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/chromeos/login/network_screen.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/chromeos/status/network_menu_button.cc
diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc
index 4f0b1ce23c67fc61b86e0131b4cc62fe2f3a623c..72ba80e0e652dd3a912f81bbedebdde70f11590a 100644
--- a/chrome/browser/chromeos/status/network_menu_button.cc
+++ b/chrome/browser/chromeos/status/network_menu_button.cc
@@ -16,6 +16,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/login/base_login_display_host.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/options/network_config_view.h"
@@ -197,8 +198,14 @@ views::MenuButton* NetworkMenuButton::GetMenuButton() {
}
gfx::NativeWindow NetworkMenuButton::GetNativeWindow() const {
- // This must always have a parent, which must have a widget ancestor.
- return parent()->GetWidget()->GetNativeWindow();
+ if (BaseLoginDisplayHost::default_host()) {
+ // When not in browser mode i.e. login screen, status area is hosted in
+ // a separate widget.
+ return BaseLoginDisplayHost::default_host()->GetNativeWindow();
+ } else {
+ // This must always have a parent, which must have a widget ancestor.
+ return parent()->GetWidget()->GetNativeWindow();
+ }
}
void NetworkMenuButton::OpenButtonOptions() {
« no previous file with comments | « chrome/browser/chromeos/login/network_screen.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698