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

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

Issue 889403004: Rename initial_pos to initial_rect in ShowWidget and ShowView IPCs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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.h" 5 #include "chrome/browser/devtools/devtools_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 WebContents* inspected_tab = GetInspectedWebContents(); 821 WebContents* inspected_tab = GetInspectedWebContents();
822 inspected_tab->GetDelegate()->ActivateContents(inspected_tab); 822 inspected_tab->GetDelegate()->ActivateContents(inspected_tab);
823 } else if (browser_) { 823 } else if (browser_) {
824 browser_->window()->Activate(); 824 browser_->window()->Activate();
825 } 825 }
826 } 826 }
827 827
828 void DevToolsWindow::AddNewContents(WebContents* source, 828 void DevToolsWindow::AddNewContents(WebContents* source,
829 WebContents* new_contents, 829 WebContents* new_contents,
830 WindowOpenDisposition disposition, 830 WindowOpenDisposition disposition,
831 const gfx::Rect& initial_pos, 831 const gfx::Rect& initial_rect,
832 bool user_gesture, 832 bool user_gesture,
833 bool* was_blocked) { 833 bool* was_blocked) {
834 if (new_contents == toolbox_web_contents_) { 834 if (new_contents == toolbox_web_contents_) {
835 toolbox_web_contents_->SetDelegate( 835 toolbox_web_contents_->SetDelegate(
836 new DevToolsToolboxDelegate(toolbox_web_contents_, 836 new DevToolsToolboxDelegate(toolbox_web_contents_,
837 inspected_contents_observer_.get())); 837 inspected_contents_observer_.get()));
838 if (main_web_contents_->GetRenderWidgetHostView() && 838 if (main_web_contents_->GetRenderWidgetHostView() &&
839 toolbox_web_contents_->GetRenderWidgetHostView()) { 839 toolbox_web_contents_->GetRenderWidgetHostView()) {
840 gfx::Size size = 840 gfx::Size size =
841 main_web_contents_->GetRenderWidgetHostView()->GetViewBounds().size(); 841 main_web_contents_->GetRenderWidgetHostView()->GetViewBounds().size();
842 toolbox_web_contents_->GetRenderWidgetHostView()->SetSize(size); 842 toolbox_web_contents_->GetRenderWidgetHostView()->SetSize(size);
843 } 843 }
844 UpdateBrowserWindow(); 844 UpdateBrowserWindow();
845 return; 845 return;
846 } 846 }
847 847
848 WebContents* inspected_web_contents = GetInspectedWebContents(); 848 WebContents* inspected_web_contents = GetInspectedWebContents();
849 if (inspected_web_contents) { 849 if (inspected_web_contents) {
850 inspected_web_contents->GetDelegate()->AddNewContents( 850 inspected_web_contents->GetDelegate()->AddNewContents(
851 source, new_contents, disposition, initial_pos, user_gesture, 851 source, new_contents, disposition, initial_rect, user_gesture,
852 was_blocked); 852 was_blocked);
853 } 853 }
854 } 854 }
855 855
856 void DevToolsWindow::WebContentsCreated(WebContents* source_contents, 856 void DevToolsWindow::WebContentsCreated(WebContents* source_contents,
857 int opener_render_frame_id, 857 int opener_render_frame_id,
858 const base::string16& frame_name, 858 const base::string16& frame_name,
859 const GURL& target_url, 859 const GURL& target_url,
860 WebContents* new_contents) { 860 WebContents* new_contents) {
861 if (target_url.SchemeIs(content::kChromeDevToolsScheme) && 861 if (target_url.SchemeIs(content::kChromeDevToolsScheme) &&
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1205 closure.Run(); 1205 closure.Run();
1206 return; 1206 return;
1207 } 1207 }
1208 load_completed_callback_ = closure; 1208 load_completed_callback_ = closure;
1209 } 1209 }
1210 1210
1211 bool DevToolsWindow::ForwardKeyboardEvent( 1211 bool DevToolsWindow::ForwardKeyboardEvent(
1212 const content::NativeWebKeyboardEvent& event) { 1212 const content::NativeWebKeyboardEvent& event) {
1213 return event_forwarder_->ForwardEvent(event); 1213 return event_forwarder_->ForwardEvent(event);
1214 } 1214 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_window.h ('k') | chrome/browser/extensions/chrome_extension_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698