chrome/browser/ui/views/external_tab_container_win.cc - Issue 11630004: DevTools: rename debugger/ to devtools/, move DevTools files into content/renderer/devtools.

Side by Side Diff: chrome/browser/ui/views/external_tab_container_win.cc

Issue 11630004: DevTools: rename debugger/ to devtools/, move DevTools files into content/renderer/devtools. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: For landing Created 8 years 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/views/extensions/extension_popup.cc ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

OLD	NEW
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/ui/views/external_tab_container_win.h"	5 #include "chrome/browser/ui/views/external_tab_container_win.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

11 #include "base/debug/trace_event.h"	11 #include "base/debug/trace_event.h"

12 #include "base/i18n/rtl.h"	12 #include "base/i18n/rtl.h"

13 #include "base/logging.h"	13 #include "base/logging.h"

14 #include "base/memory/scoped_ptr.h"	14 #include "base/memory/scoped_ptr.h"

15 #include "base/string16.h"	15 #include "base/string16.h"

16 #include "base/time.h"	16 #include "base/time.h"

17 #include "base/utf_string_conversions.h"	17 #include "base/utf_string_conversions.h"

18 #include "base/win/win_util.h"	18 #include "base/win/win_util.h"

19 #include "chrome/app/chrome_command_ids.h"	19 #include "chrome/app/chrome_command_ids.h"

20 #include "chrome/app/chrome_dll_resource.h"	20 #include "chrome/app/chrome_dll_resource.h"

21 #include "chrome/browser/automation/automation_provider.h"	21 #include "chrome/browser/automation/automation_provider.h"

22 #include "chrome/browser/debugger/devtools_toggle_action.h"	22 #include "chrome/browser/devtools/devtools_toggle_action.h"

23 #include "chrome/browser/debugger/devtools_window.h"	23 #include "chrome/browser/devtools/devtools_window.h"

24 #include "chrome/browser/file_select_helper.h"	24 #include "chrome/browser/file_select_helper.h"

25 #include "chrome/browser/history/history_tab_helper.h"	25 #include "chrome/browser/history/history_tab_helper.h"

26 #include "chrome/browser/history/history_types.h"	26 #include "chrome/browser/history/history_types.h"

27 #include "chrome/browser/infobars/infobar_tab_helper.h"	27 #include "chrome/browser/infobars/infobar_tab_helper.h"

28 #include "chrome/browser/pepper_broker_infobar_delegate.h"	28 #include "chrome/browser/pepper_broker_infobar_delegate.h"

29 #include "chrome/browser/profiles/profile.h"	29 #include "chrome/browser/profiles/profile.h"

30 #include "chrome/browser/repost_form_warning_controller.h"	30 #include "chrome/browser/repost_form_warning_controller.h"

31 #include "chrome/browser/themes/theme_service.h"	31 #include "chrome/browser/themes/theme_service.h"

32 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"	32 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"

33 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"	33 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"

(...skipping 1241 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1275 if (params.disposition == CURRENT_TAB) {	1275 if (params.disposition == CURRENT_TAB) {

1276 DCHECK(route_all_top_level_navigations_);	1276 DCHECK(route_all_top_level_navigations_);

1277 forward_params.disposition = NEW_FOREGROUND_TAB;	1277 forward_params.disposition = NEW_FOREGROUND_TAB;

1278 }	1278 }

1279 WebContents* new_contents =	1279 WebContents* new_contents =

1280 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);	1280 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);

1281 // support only one navigation for a dummy tab before it is killed.	1281 // support only one navigation for a dummy tab before it is killed.

1282 ::DestroyWindow(GetNativeView());	1282 ::DestroyWindow(GetNativeView());

1283 return new_contents;	1283 return new_contents;

1284 }	1284 }

OLD	NEW