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

Unified Diff: chrome/browser/chromeos/net/network_connect_delegate_chromeos.cc

Issue 2434683003: Move NetworkStateNotifier and NetworkConnect from src/ui (Closed)
Patch Set: Fix virtuals Created 4 years, 2 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/net/network_connect_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc b/chrome/browser/chromeos/net/network_connect_delegate_chromeos.cc
similarity index 78%
rename from chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
rename to chrome/browser/chromeos/net/network_connect_delegate_chromeos.cc
index 4342b467631ded7885af5a321b951f03cc45054b..895a4b16855923c24ab09aa81063c8c0a5c1d5cb 100644
--- a/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
+++ b/chrome/browser/chromeos/net/network_connect_delegate_chromeos.cc
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h"
+#include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "chrome/browser/chromeos/enrollment_dialog_view.h"
+#include "chrome/browser/chromeos/net/network_state_notifier.h"
#include "chrome/browser/chromeos/sim_dialog_delegate.h"
#include "chrome/browser/ui/ash/system_tray_client.h"
#include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
@@ -29,7 +30,8 @@ gfx::NativeWindow GetNativeWindow() {
namespace chromeos {
-NetworkConnectDelegateChromeOS::NetworkConnectDelegateChromeOS() {}
+NetworkConnectDelegateChromeOS::NetworkConnectDelegateChromeOS()
+ : network_state_notifier_(new NetworkStateNotifier()) {}
NetworkConnectDelegateChromeOS::~NetworkConnectDelegateChromeOS() {}
@@ -68,4 +70,15 @@ void NetworkConnectDelegateChromeOS::ShowMobileSetupDialog(
MobileSetupDialog::ShowByNetworkId(network_id);
}
+void NetworkConnectDelegateChromeOS::ShowNetworkConnectError(
+ const std::string& error_name,
+ const std::string& network_id) {
+ network_state_notifier_->ShowNetworkConnectError(error_name, network_id);
+}
+
+void NetworkConnectDelegateChromeOS::ShowMobileActivationError(
+ const std::string& network_id) {
+ network_state_notifier_->ShowMobileActivationError(network_id);
+}
+
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/net/network_connect_delegate_chromeos.h ('k') | chrome/browser/chromeos/net/network_state_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698