| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/apps/chrome_app_window_client.h" | 5 #include "chrome/browser/ui/apps/chrome_app_window_client.h" |
| 6 | 6 |
| 7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
| 8 #include "chrome/browser/apps/scoped_keep_alive.h" | 8 #include "chrome/browser/apps/scoped_keep_alive.h" |
| 9 #include "chrome/browser/devtools/devtools_window.h" | 9 #include "chrome/browser/devtools/devtools_window.h" |
| 10 #include "chrome/common/extensions/features/feature_channel.h" | 10 #include "chrome/common/extensions/features/feature_channel.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 DevToolsWindow* devtools_window = | 63 DevToolsWindow* devtools_window = |
| 64 DevToolsWindow::FindDevToolsWindow(agent.get()); | 64 DevToolsWindow::FindDevToolsWindow(agent.get()); |
| 65 if (devtools_window) | 65 if (devtools_window) |
| 66 devtools_window->SetLoadCompletedCallback(callback); | 66 devtools_window->SetLoadCompletedCallback(callback); |
| 67 else | 67 else |
| 68 callback.Run(); | 68 callback.Run(); |
| 69 } | 69 } |
| 70 | 70 |
| 71 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() { | 71 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() { |
| 72 return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV; | 72 return extensions::GetCurrentChannel() > version_info::Channel::DEV; |
| 73 } | 73 } |
| OLD | NEW |