Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: chrome/browser/ui/apps/chrome_app_window_client.cc

Issue 631333003: Adding application lifetime tests to athena, allowing to override focus request for applciations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/apps/chrome_app_window_client.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 26 matching lines...) Expand all
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 extensions::NativeAppWindow* ChromeAppWindowClient::CreateNativeAppWindow(
46 extensions::AppWindow* window, 46 extensions::AppWindow* window,
47 const extensions::AppWindow::CreateParams& params) { 47 extensions::AppWindow::CreateParams* params) {
48 #if defined(OS_ANDROID) 48 #if defined(OS_ANDROID)
49 return NULL; 49 return NULL;
50 #else 50 #else
51 return CreateNativeAppWindowImpl(window, params); 51 return CreateNativeAppWindowImpl(window, *params);
52 #endif 52 #endif
53 } 53 }
54 54
55 void ChromeAppWindowClient::OpenDevToolsWindow( 55 void ChromeAppWindowClient::OpenDevToolsWindow(
56 content::WebContents* web_contents, 56 content::WebContents* web_contents,
57 const base::Closure& callback) { 57 const base::Closure& callback) {
58 DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindow( 58 DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindow(
59 web_contents, DevToolsToggleAction::ShowConsole()); 59 web_contents, DevToolsToggleAction::ShowConsole());
60 devtools_window->SetLoadCompletedCallback(callback); 60 devtools_window->SetLoadCompletedCallback(callback);
61 } 61 }
62 62
63 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() { 63 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() {
64 return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV; 64 return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV;
65 } 65 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/apps/chrome_app_window_client.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698