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

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc

Issue 9420007: Move RenderWidgetHostView into content namespace. Fix include paths. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_chromeos_gtk build issue not caught by trybots. Created 8 years, 10 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 "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win .h" 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win .h"
6 6
7 #include "chrome/browser/ui/view_ids.h" 7 #include "chrome/browser/ui/view_ids.h"
8 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" 8 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
9 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" 9 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
10 #include "content/browser/renderer_host/render_widget_host_view.h" 10 #include "content/public/browser/render_widget_host_view.h"
11 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
12 #include "ui/base/accessibility/accessible_view_state.h" 12 #include "ui/base/accessibility/accessible_view_state.h"
13 #include "ui/views/focus/focus_manager.h" 13 #include "ui/views/focus/focus_manager.h"
14 #include "ui/views/focus/widget_focus_manager.h" 14 #include "ui/views/focus/widget_focus_manager.h"
15 15
16 using content::WebContents; 16 using content::WebContents;
17 17
18 //////////////////////////////////////////////////////////////////////////////// 18 ////////////////////////////////////////////////////////////////////////////////
19 // NativeTabContentsContainerWin, public: 19 // NativeTabContentsContainerWin, public:
20 20
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 void NativeTabContentsContainerWin::GetAccessibleState( 142 void NativeTabContentsContainerWin::GetAccessibleState(
143 ui::AccessibleViewState* state) { 143 ui::AccessibleViewState* state) {
144 state->role = ui::AccessibilityTypes::ROLE_GROUPING; 144 state->role = ui::AccessibilityTypes::ROLE_GROUPING;
145 } 145 }
146 146
147 gfx::NativeViewAccessible 147 gfx::NativeViewAccessible
148 NativeTabContentsContainerWin::GetNativeViewAccessible() { 148 NativeTabContentsContainerWin::GetNativeViewAccessible() {
149 WebContents* web_contents = container_->web_contents(); 149 WebContents* web_contents = container_->web_contents();
150 if (web_contents) { 150 if (web_contents) {
151 RenderWidgetHostView* host_view = web_contents->GetRenderWidgetHostView(); 151 content::RenderWidgetHostView* host_view =
152 web_contents->GetRenderWidgetHostView();
152 if (host_view) 153 if (host_view)
153 return host_view->GetNativeViewAccessible(); 154 return host_view->GetNativeViewAccessible();
154 } 155 }
155 156
156 return View::GetNativeViewAccessible(); 157 return View::GetNativeViewAccessible();
157 } 158 }
158 159
159 //////////////////////////////////////////////////////////////////////////////// 160 ////////////////////////////////////////////////////////////////////////////////
160 // NativeTabContentsContainer, public: 161 // NativeTabContentsContainer, public:
161 162
162 // static 163 // static
163 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( 164 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
164 TabContentsContainer* container) { 165 TabContentsContainer* container) {
165 return new NativeTabContentsContainerWin(container); 166 return new NativeTabContentsContainerWin(container);
166 } 167 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698