chrome/browser/ui/views/external_tab_container_win.cc - Issue 16109004: Update refernces to Blink's Platform API (chrome)

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

Issue 16109004: Update refernces to Blink's Platform API (chrome) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/sessions/session_types_unittest.cc ('k') | chrome/common/localized_error.cc » ('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 <atlbase.h>	7 #include <atlbase.h>

8 #include <atlapp.h>	8 #include <atlapp.h>

9 #include <atlconv.h>	9 #include <atlconv.h>

10 #include <atlcrack.h>	10 #include <atlcrack.h>

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 #include "content/public/browser/web_contents.h"	59 #include "content/public/browser/web_contents.h"

60 #include "content/public/browser/web_contents_view.h"	60 #include "content/public/browser/web_contents_view.h"

61 #include "content/public/common/bindings_policy.h"	61 #include "content/public/common/bindings_policy.h"

62 #include "content/public/common/frame_navigate_params.h"	62 #include "content/public/common/frame_navigate_params.h"

63 #include "content/public/common/page_transition_types.h"	63 #include "content/public/common/page_transition_types.h"

64 #include "content/public/common/page_zoom.h"	64 #include "content/public/common/page_zoom.h"

65 #include "content/public/common/renderer_preferences.h"	65 #include "content/public/common/renderer_preferences.h"

66 #include "content/public/common/ssl_status.h"	66 #include "content/public/common/ssl_status.h"

67 #include "grit/generated_resources.h"	67 #include "grit/generated_resources.h"

68 #include "grit/locale_settings.h"	68 #include "grit/locale_settings.h"

69 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"	69 #include "third_party/WebKit/public/platform/WebCString.h"

70 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h "	70 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"

71 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"	71 #include "third_party/WebKit/public/platform/WebString.h"

72 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"	72 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"

73 #include "ui/base/events/event_utils.h"	73 #include "ui/base/events/event_utils.h"

74 #include "ui/base/l10n/l10n_util.h"	74 #include "ui/base/l10n/l10n_util.h"

75 #include "ui/base/models/menu_model.h"	75 #include "ui/base/models/menu_model.h"

76 #include "ui/base/view_prop.h"	76 #include "ui/base/view_prop.h"

77 #include "ui/views/controls/webview/webview.h"	77 #include "ui/views/controls/webview/webview.h"

78 #include "ui/views/layout/grid_layout.h"	78 #include "ui/views/layout/grid_layout.h"

79 #include "ui/views/widget/widget.h"	79 #include "ui/views/widget/widget.h"

80 #include "ui/views/win/hwnd_util.h"	80 #include "ui/views/win/hwnd_util.h"

81	81

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

1445 DCHECK(route_all_top_level_navigations_);	1445 DCHECK(route_all_top_level_navigations_);

1446 forward_params.disposition = NEW_FOREGROUND_TAB;	1446 forward_params.disposition = NEW_FOREGROUND_TAB;

1447 }	1447 }

1448 WebContents* new_contents =	1448 WebContents* new_contents =

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

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

1451 widget_->CloseNow();	1451 widget_->CloseNow();

1452 return new_contents;	1452 return new_contents;

1453 }	1453 }

OLD	NEW