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" |
| 11 #include "components/version_info/version_info.h" |
11 #include "content/public/browser/devtools_agent_host.h" | 12 #include "content/public/browser/devtools_agent_host.h" |
12 #include "extensions/browser/app_window/app_window.h" | 13 #include "extensions/browser/app_window/app_window.h" |
13 #include "extensions/common/extension.h" | 14 #include "extensions/common/extension.h" |
14 | 15 |
15 // TODO(jamescook): We probably shouldn't compile this class at all on Android. | 16 // TODO(jamescook): We probably shouldn't compile this class at all on Android. |
16 // See http://crbug.com/343612 | 17 // See http://crbug.com/343612 |
17 #if !defined(OS_ANDROID) | 18 #if !defined(OS_ANDROID) |
18 #include "chrome/browser/ui/apps/chrome_app_delegate.h" | 19 #include "chrome/browser/ui/apps/chrome_app_delegate.h" |
19 #endif | 20 #endif |
20 | 21 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 DevToolsWindow::FindDevToolsWindow(agent.get()); | 65 DevToolsWindow::FindDevToolsWindow(agent.get()); |
65 if (devtools_window) | 66 if (devtools_window) |
66 devtools_window->SetLoadCompletedCallback(callback); | 67 devtools_window->SetLoadCompletedCallback(callback); |
67 else | 68 else |
68 callback.Run(); | 69 callback.Run(); |
69 } | 70 } |
70 | 71 |
71 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() { | 72 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() { |
72 return extensions::GetCurrentChannel() > version_info::Channel::DEV; | 73 return extensions::GetCurrentChannel() > version_info::Channel::DEV; |
73 } | 74 } |
OLD | NEW |