diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 01:18:09 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 01:18:09 +0000 |
| commit | b2e87adc76ba5044838c70bc6d97975c2ef09119 (patch) | |
| tree | d0cc2418adfe38340211e50ecc7c6e813254d0ab /ash | |
| parent | 68074500d44d19ffd03779c8073c9dfad118f14a (diff) | |
| download | chromium_src-b2e87adc76ba5044838c70bc6d97975c2ef09119.zip chromium_src-b2e87adc76ba5044838c70bc6d97975c2ef09119.tar.gz chromium_src-b2e87adc76ba5044838c70bc6d97975c2ef09119.tar.bz2 | |
Refactored mobile activation engine outside of WebUI handler in order to expose its state to other layer of UI (i.e. dialog, background activation process...).
BUG=130420
TEST=manual regression test for mobile device activation
Review URL: https://chromiumcodereview.appspot.com/10456045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 2 | ||||
| -rw-r--r-- | ash/shell/shell_delegate_impl.h | 2 | ||||
| -rw-r--r-- | ash/shell_delegate.h | 2 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 2 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 6dc3dc7..be403c8 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -75,7 +75,7 @@ void ShellDelegateImpl::OpenFileManager() { void ShellDelegateImpl::OpenCrosh() { } -void ShellDelegateImpl::OpenMobileSetup() { +void ShellDelegateImpl::OpenMobileSetup(const std::string& service_path) { } void ShellDelegateImpl::RestoreTab() { diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index 4534347..a97522f 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h @@ -33,7 +33,7 @@ class ShellDelegateImpl : public ash::ShellDelegate { virtual void Search() OVERRIDE; virtual void OpenFileManager() OVERRIDE; virtual void OpenCrosh() OVERRIDE; - virtual void OpenMobileSetup() OVERRIDE; + virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE; virtual void RestoreTab() OVERRIDE; virtual void ShowKeyboardOverlay() OVERRIDE; virtual void ShowTaskManager() OVERRIDE; diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h index 5bb5303..357b0f0 100644 --- a/ash/shell_delegate.h +++ b/ash/shell_delegate.h @@ -78,7 +78,7 @@ class ASH_EXPORT ShellDelegate { virtual void OpenCrosh() = 0; // Invoked when the user needs to set up mobile networking. - virtual void OpenMobileSetup() = 0; + virtual void OpenMobileSetup(const std::string& service_path) = 0; // Invoked when the user uses Shift+Ctrl+T to restore the closed tab. virtual void RestoreTab() = 0; diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 258770a..5a290a1 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -60,7 +60,7 @@ void TestShellDelegate::OpenFileManager() { void TestShellDelegate::OpenCrosh() { } -void TestShellDelegate::OpenMobileSetup() { +void TestShellDelegate::OpenMobileSetup(const std::string& service_path) { } void TestShellDelegate::RestoreTab() { diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index f9d6113..4b349b6 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -29,7 +29,7 @@ class TestShellDelegate : public ShellDelegate { virtual void Search() OVERRIDE; virtual void OpenFileManager() OVERRIDE; virtual void OpenCrosh() OVERRIDE; - virtual void OpenMobileSetup() OVERRIDE; + virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE; virtual void RestoreTab() OVERRIDE; virtual void ShowKeyboardOverlay() OVERRIDE; virtual void ShowTaskManager() OVERRIDE; |