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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10540091: Rename gfx::Monitor to gfx::Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "content/public/common/content_restriction.h" 62 #include "content/public/common/content_restriction.h"
63 #include "content/public/common/content_switches.h" 63 #include "content/public/common/content_switches.h"
64 #include "content/public/common/url_constants.h" 64 #include "content/public/common/url_constants.h"
65 #include "net/base/mime_util.h" 65 #include "net/base/mime_util.h"
66 #include "net/base/net_util.h" 66 #include "net/base/net_util.h"
67 #include "net/base/network_change_notifier.h" 67 #include "net/base/network_change_notifier.h"
68 #include "net/url_request/url_request_context_getter.h" 68 #include "net/url_request/url_request_context_getter.h"
69 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 69 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
70 #include "ui/base/layout.h" 70 #include "ui/base/layout.h"
71 #include "ui/base/ui_base_switches.h" 71 #include "ui/base/ui_base_switches.h"
72 #include "ui/gfx/monitor.h" 72 #include "ui/gfx/display.h"
73 #include "ui/gfx/screen.h" 73 #include "ui/gfx/screen.h"
74 #include "webkit/glue/web_intent_data.h" 74 #include "webkit/glue/web_intent_data.h"
75 #include "webkit/glue/web_intent_service_data.h" 75 #include "webkit/glue/web_intent_service_data.h"
76 #include "webkit/glue/webpreferences.h" 76 #include "webkit/glue/webpreferences.h"
77 77
78 #if defined(OS_MACOSX) 78 #if defined(OS_MACOSX)
79 #include "base/mac/foundation_util.h" 79 #include "base/mac/foundation_util.h"
80 #include "ui/surface/io_surface_support_mac.h" 80 #include "ui/surface/io_surface_support_mac.h"
81 #endif 81 #endif
82 82
(...skipping 2937 matching lines...) Expand 10 before | Expand all | Expand 10 after
3020 browser_plugin_host()->embedder_render_process_host(); 3020 browser_plugin_host()->embedder_render_process_host();
3021 *embedder_container_id = browser_plugin_host()->instance_id(); 3021 *embedder_container_id = browser_plugin_host()->instance_id();
3022 int embedder_process_id = 3022 int embedder_process_id =
3023 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; 3023 embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
3024 if (embedder_process_id != -1) { 3024 if (embedder_process_id != -1) {
3025 *embedder_channel_name = 3025 *embedder_channel_name =
3026 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), 3026 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
3027 embedder_process_id); 3027 embedder_process_id);
3028 } 3028 }
3029 } 3029 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698