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

Side by Side Diff: chrome/browser/external_tab/external_tab_container_win.cc

Issue 10139023: Handle move of WebKit's WebReferrerPolicy.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated wrt landed commonparamtraits patch... Created 8 years, 8 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 | « no previous file | content/public/browser/resource_request_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/external_tab/external_tab_container_win.h" 5 #include "chrome/browser/external_tab/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"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
51 #include "content/public/browser/web_intents_dispatcher.h" 51 #include "content/public/browser/web_intents_dispatcher.h"
52 #include "content/public/common/bindings_policy.h" 52 #include "content/public/common/bindings_policy.h"
53 #include "content/public/common/frame_navigate_params.h" 53 #include "content/public/common/frame_navigate_params.h"
54 #include "content/public/common/page_transition_types.h" 54 #include "content/public/common/page_transition_types.h"
55 #include "content/public/common/page_zoom.h" 55 #include "content/public/common/page_zoom.h"
56 #include "content/public/common/renderer_preferences.h" 56 #include "content/public/common/renderer_preferences.h"
57 #include "content/public/common/ssl_status.h" 57 #include "content/public/common/ssl_status.h"
58 #include "grit/generated_resources.h" 58 #include "grit/generated_resources.h"
59 #include "grit/locale_settings.h" 59 #include "grit/locale_settings.h"
60 #include "third_party/WebKit/Source/WebKit/chromium/public/WebReferrerPolicy.h" 60 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h "
61 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" 61 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
62 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h " 62 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h "
63 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 63 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
64 #include "ui/base/l10n/l10n_util.h" 64 #include "ui/base/l10n/l10n_util.h"
65 #include "ui/base/models/menu_model.h" 65 #include "ui/base/models/menu_model.h"
66 #include "ui/base/view_prop.h" 66 #include "ui/base/view_prop.h"
67 #include "ui/views/layout/grid_layout.h" 67 #include "ui/views/layout/grid_layout.h"
68 #include "ui/views/controls/webview/webview.h" 68 #include "ui/views/controls/webview/webview.h"
69 69
70 using content::BrowserThread; 70 using content::BrowserThread;
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 if (params.disposition == CURRENT_TAB) { 1204 if (params.disposition == CURRENT_TAB) {
1205 DCHECK(route_all_top_level_navigations_); 1205 DCHECK(route_all_top_level_navigations_);
1206 forward_params.disposition = NEW_FOREGROUND_TAB; 1206 forward_params.disposition = NEW_FOREGROUND_TAB;
1207 } 1207 }
1208 WebContents* new_contents = 1208 WebContents* new_contents =
1209 ExternalTabContainer::OpenURLFromTab(source, forward_params); 1209 ExternalTabContainer::OpenURLFromTab(source, forward_params);
1210 // support only one navigation for a dummy tab before it is killed. 1210 // support only one navigation for a dummy tab before it is killed.
1211 ::DestroyWindow(GetNativeView()); 1211 ::DestroyWindow(GetNativeView());
1212 return new_contents; 1212 return new_contents;
1213 } 1213 }
OLDNEW
« no previous file with comments | « no previous file | content/public/browser/resource_request_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698