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

Side by Side Diff: chrome/browser/devtools/devtools_window_testing.cc

Issue 1228863006: devtools: avoid relying on the internal variables for browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add DetachFromBrowser() Created 5 years, 5 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/devtools/devtools_window.cc ('k') | no next file » | 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/devtools/devtools_window_testing.h" 5 #include "chrome/browser/devtools/devtools_window_testing.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "chrome/browser/devtools/devtools_window.h" 8 #include "chrome/browser/devtools/devtools_window.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 for (DevToolsWindowTestings::iterator it(instances->begin()); 58 for (DevToolsWindowTestings::iterator it(instances->begin());
59 it != instances->end(); 59 it != instances->end();
60 ++it) { 60 ++it) {
61 if ((*it)->devtools_window_ == window) 61 if ((*it)->devtools_window_ == window)
62 return *it; 62 return *it;
63 } 63 }
64 return NULL; 64 return NULL;
65 } 65 }
66 66
67 Browser* DevToolsWindowTesting::browser() { 67 Browser* DevToolsWindowTesting::browser() {
68 return devtools_window_->browser_; 68 return devtools_window_->GetBrowser();
69 } 69 }
70 70
71 content::WebContents* DevToolsWindowTesting::main_web_contents() { 71 content::WebContents* DevToolsWindowTesting::main_web_contents() {
72 return devtools_window_->main_web_contents_; 72 return devtools_window_->main_web_contents_;
73 } 73 }
74 74
75 content::WebContents* DevToolsWindowTesting::toolbox_web_contents() { 75 content::WebContents* DevToolsWindowTesting::toolbox_web_contents() {
76 return devtools_window_->toolbox_web_contents_; 76 return devtools_window_->toolbox_web_contents_;
77 } 77 }
78 78
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 DevToolsWindow::OpenDevToolsWindowForWorker( 129 DevToolsWindow::OpenDevToolsWindowForWorker(
130 profile, worker_agent); 130 profile, worker_agent);
131 DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(worker_agent); 131 DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(worker_agent);
132 WaitForDevToolsWindowLoad(window); 132 WaitForDevToolsWindowLoad(window);
133 return window; 133 return window;
134 } 134 }
135 135
136 // static 136 // static
137 void DevToolsWindowTesting::CloseDevToolsWindow( 137 void DevToolsWindowTesting::CloseDevToolsWindow(
138 DevToolsWindow* window) { 138 DevToolsWindow* window) {
139 if (window->is_docked_) { 139 if (window->IsDocked()) {
140 window->CloseWindow(); 140 window->CloseWindow();
141 } else { 141 } else {
142 window->browser_->window()->Close(); 142 window->GetBrowser()->window()->Close();
143 } 143 }
144 } 144 }
145 145
146 // static 146 // static
147 void DevToolsWindowTesting::CloseDevToolsWindowSync( 147 void DevToolsWindowTesting::CloseDevToolsWindowSync(
148 DevToolsWindow* window) { 148 DevToolsWindow* window) {
149 scoped_refptr<content::MessageLoopRunner> runner = 149 scoped_refptr<content::MessageLoopRunner> runner =
150 new content::MessageLoopRunner; 150 new content::MessageLoopRunner;
151 DevToolsWindowTesting::Get(window)->SetCloseCallback(runner->QuitClosure()); 151 DevToolsWindowTesting::Get(window)->SetCloseCallback(runner->QuitClosure());
152 CloseDevToolsWindow(window); 152 CloseDevToolsWindow(window);
153 runner->Run(); 153 runner->Run();
154 } 154 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_window.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698