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

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

Issue 890463003: [DevTools] Fix crash in DevToolsWindow::Create (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 if (devtools_window) {
61 devtools_window->SetLoadCompletedCallback(callback);
62 } else {
63 callback.Run();
64 }
61 } 65 }
62 66
63 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() { 67 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() {
64 return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV; 68 return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV;
65 } 69 }
OLDNEW
« chrome/browser/devtools/devtools_window.cc ('K') | « chrome/browser/devtools/devtools_window.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698