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

Unified Diff: chrome/browser/chromeos/options/network_config_view.h

Issue 2053001: Fix crash when opening "Select certificate file" in OOBE. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: added correct way to check for OOBE/login mode Created 10 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/options/network_config_view.h
diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h
index 65704bdeadb9321f2de75b3d6593315f1b4822ed..3b42abd1526d5925d44ea1dcadeeef2cc5adfae3 100644
--- a/chrome/browser/chromeos/options/network_config_view.h
+++ b/chrome/browser/chromeos/options/network_config_view.h
@@ -38,6 +38,9 @@ class NetworkConfigView : public views::View,
explicit NetworkConfigView();
virtual ~NetworkConfigView() {}
+ // Returns corresponding native window.
+ gfx::NativeWindow GetNativeWindow() const;
+
// views::DialogDelegate methods.
virtual std::wstring GetDialogButtonLabel(
MessageBoxFlags::DialogButton button) const;
@@ -59,6 +62,14 @@ class NetworkConfigView : public views::View,
// Sets the focus on the login tab's first textfield.
void SetLoginTextfieldFocus();
+ // Getter/setter for browser mode.
+ void set_browser_mode(bool value) {
+ browser_mode_ = value;
+ }
+ bool is_browser_mode() const {
+ return browser_mode_;
+ }
+
protected:
// views::View overrides:
virtual void Layout();
@@ -80,6 +91,9 @@ class NetworkConfigView : public views::View,
// Initializes UI.
void Init();
+ // True when opening in browser, otherwise in OOBE/login mode.
+ bool browser_mode_;
+
views::TabbedPane* tabs_;
// NetworkConfigFlags to specify which UIs to show.
« no previous file with comments | « chrome/browser/chromeos/login/network_screen.cc ('k') | chrome/browser/chromeos/options/network_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698