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 24 matching lines...) Expand all Loading... |
35 #if defined(OS_ANDROID) | 35 #if defined(OS_ANDROID) |
36 return NULL; | 36 return NULL; |
37 #else | 37 #else |
38 return new extensions::AppWindow( | 38 return new extensions::AppWindow( |
39 context, | 39 context, |
40 new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)), | 40 new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)), |
41 extension); | 41 extension); |
42 #endif | 42 #endif |
43 } | 43 } |
44 | 44 |
45 extensions::NativeAppWindow* ChromeAppWindowClient::CreateNativeAppWindow( | 45 native_app_window::NativeAppWindow* |
| 46 ChromeAppWindowClient::CreateNativeAppWindow( |
46 extensions::AppWindow* window, | 47 extensions::AppWindow* window, |
47 const extensions::AppWindow::CreateParams& params) { | 48 const extensions::AppWindow::CreateParams& params) { |
48 #if defined(OS_ANDROID) | 49 #if defined(OS_ANDROID) |
49 return NULL; | 50 return NULL; |
50 #else | 51 #else |
51 return CreateNativeAppWindowImpl(window, params); | 52 return CreateNativeAppWindowImpl(window, params); |
52 #endif | 53 #endif |
53 } | 54 } |
54 | 55 |
55 void ChromeAppWindowClient::OpenDevToolsWindow( | 56 void ChromeAppWindowClient::OpenDevToolsWindow( |
56 content::WebContents* web_contents, | 57 content::WebContents* web_contents, |
57 const base::Closure& callback) { | 58 const base::Closure& callback) { |
58 DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindow( | 59 DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindow( |
59 web_contents, DevToolsToggleAction::ShowConsole()); | 60 web_contents, DevToolsToggleAction::ShowConsole()); |
60 devtools_window->SetLoadCompletedCallback(callback); | 61 devtools_window->SetLoadCompletedCallback(callback); |
61 } | 62 } |
62 | 63 |
63 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() { | 64 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() { |
64 return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV; | 65 return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV; |
65 } | 66 } |
OLD | NEW |