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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 8342048: Make NotificationService an interface in the content namespace, and switch callers to use it. Mov... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/renderer_host/render_widget_host_view_views.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/task.h" 15 #include "base/task.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 "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
19 #include "chrome/common/native_web_keyboard_event_views.h" 19 #include "chrome/common/native_web_keyboard_event_views.h"
20 #include "chrome/common/render_messages.h" 20 #include "chrome/common/render_messages.h"
21 #include "content/browser/renderer_host/backing_store_skia.h" 21 #include "content/browser/renderer_host/backing_store_skia.h"
22 #include "content/browser/renderer_host/render_widget_host.h" 22 #include "content/browser/renderer_host/render_widget_host.h"
23 #include "content/common/notification_service.h" 23 #include "content/public/browser/notification_service.h"
24 #include "content/common/result_codes.h" 24 #include "content/common/result_codes.h"
25 #include "content/common/view_messages.h" 25 #include "content/common/view_messages.h"
26 #include "grit/ui_strings.h" 26 #include "grit/ui_strings.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFact ory.h" 28 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFact ory.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/x11/WebScreenInfoFact ory.h" 29 #include "third_party/WebKit/Source/WebKit/chromium/public/x11/WebScreenInfoFact ory.h"
30 #include "ui/base/clipboard/clipboard.h" 30 #include "ui/base/clipboard/clipboard.h"
31 #include "ui/base/text/text_elider.h" 31 #include "ui/base/text/text_elider.h"
32 #include "ui/gfx/canvas.h" 32 #include "ui/gfx/canvas.h"
33 #include "ui/gfx/canvas_skia.h" 33 #include "ui/gfx/canvas_skia.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_( 123 ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_(
124 views::TouchSelectionController::create(this))), 124 views::TouchSelectionController::create(this))),
125 ALLOW_THIS_IN_INITIALIZER_LIST(update_touch_selection_(this)) { 125 ALLOW_THIS_IN_INITIALIZER_LIST(update_touch_selection_(this)) {
126 set_focusable(true); 126 set_focusable(true);
127 host_->SetView(this); 127 host_->SetView(this);
128 128
129 #if defined(TOUCH_UI) 129 #if defined(TOUCH_UI)
130 SetPaintToLayer(true); 130 SetPaintToLayer(true);
131 registrar_.Add(this, 131 registrar_.Add(this,
132 chrome::NOTIFICATION_KEYBOARD_VISIBLE_BOUNDS_CHANGED, 132 chrome::NOTIFICATION_KEYBOARD_VISIBLE_BOUNDS_CHANGED,
133 NotificationService::AllSources()); 133 content::NotificationService::AllSources());
134 #endif 134 #endif
135 } 135 }
136 136
137 RenderWidgetHostViewViews::~RenderWidgetHostViewViews() { 137 RenderWidgetHostViewViews::~RenderWidgetHostViewViews() {
138 } 138 }
139 139
140 void RenderWidgetHostViewViews::InitAsChild() { 140 void RenderWidgetHostViewViews::InitAsChild() {
141 Show(); 141 Show();
142 } 142 }
143 143
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 for (std::vector< base::Callback<void(void)> >::const_iterator 1159 for (std::vector< base::Callback<void(void)> >::const_iterator
1160 it = on_compositing_ended_callbacks_.begin(); 1160 it = on_compositing_ended_callbacks_.begin();
1161 it != on_compositing_ended_callbacks_.end(); ++it) { 1161 it != on_compositing_ended_callbacks_.end(); ++it) {
1162 it->Run(); 1162 it->Run();
1163 } 1163 }
1164 on_compositing_ended_callbacks_.clear(); 1164 on_compositing_ended_callbacks_.clear();
1165 compositor->RemoveObserver(this); 1165 compositor->RemoveObserver(this);
1166 } 1166 }
1167 1167
1168 #endif 1168 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698