Index: ash/shell/shell_delegate_impl.cc |
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc |
index dc081c6fc359aba744fdf4c1c1020099b65bc638..f7459e940f6a1a1d6dca9a3e907646e6d6017aa7 100644 |
--- a/ash/shell/shell_delegate_impl.cc |
+++ b/ash/shell/shell_delegate_impl.cc |
@@ -181,6 +181,18 @@ bool ShellDelegateImpl::IsMultiAccountEnabled() const { |
return false; |
} |
+bool ShellDelegateImpl::ForceMaximizeOnFirstRun() const { |
bartfab (slow)
2015/04/02 08:44:28
You have a merge error here. The method appears th
peletskyi
2015/04/02 12:53:29
Done.
|
+ return false; |
+} |
+ |
+bool ShellDelegateImpl::ForceMaximizeOnFirstRun() const { |
+ return false; |
+} |
+ |
+bool ShellDelegateImpl::ForceMaximizeOnFirstRun() const { |
+ return false; |
+} |
+ |
void ShellDelegateImpl::PreInit() { |
} |