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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 10310136: ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 8 years, 7 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/ui/views/autocomplete/autocomplete_result_view.cc ('k') | ui/DEPS » ('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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 #include "webkit/plugins/npapi/webplugin_delegate.h" 176 #include "webkit/plugins/npapi/webplugin_delegate.h"
177 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 177 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
178 #include "webkit/plugins/npapi/webplugin_impl.h" 178 #include "webkit/plugins/npapi/webplugin_impl.h"
179 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" 179 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
180 180
181 #if defined(OS_ANDROID) 181 #if defined(OS_ANDROID)
182 #include "webkit/media/android/webmediaplayer_android.h" 182 #include "webkit/media/android/webmediaplayer_android.h"
183 #elif defined(OS_WIN) 183 #elif defined(OS_WIN)
184 // TODO(port): these files are currently Windows only because they concern: 184 // TODO(port): these files are currently Windows only because they concern:
185 // * theming 185 // * theming
186 #include "ui/gfx/native_theme_win.h" 186 #include "ui/base/native_theme/native_theme_win.h"
187 #elif defined(USE_X11) 187 #elif defined(USE_X11)
188 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebRenderTheme. h" 188 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebRenderTheme. h"
189 #include "ui/gfx/native_theme.h" 189 #include "ui/base/native_theme/native_theme.h"
190 #elif defined(OS_MACOSX) 190 #elif defined(OS_MACOSX)
191 #include "skia/ext/skia_utils_mac.h" 191 #include "skia/ext/skia_utils_mac.h"
192 #endif 192 #endif
193 193
194 using WebKit::WebAccessibilityNotification; 194 using WebKit::WebAccessibilityNotification;
195 using WebKit::WebAccessibilityObject; 195 using WebKit::WebAccessibilityObject;
196 using WebKit::WebApplicationCacheHost; 196 using WebKit::WebApplicationCacheHost;
197 using WebKit::WebApplicationCacheHostClient; 197 using WebKit::WebApplicationCacheHostClient;
198 using WebKit::WebCString; 198 using WebKit::WebCString;
199 using WebKit::WebColor; 199 using WebKit::WebColor;
(...skipping 4166 matching lines...) Expand 10 before | Expand all | Expand 10 after
4366 4366
4367 void RenderViewImpl::OnSetRendererPrefs( 4367 void RenderViewImpl::OnSetRendererPrefs(
4368 const content::RendererPreferences& renderer_prefs) { 4368 const content::RendererPreferences& renderer_prefs) {
4369 double old_zoom_level = renderer_preferences_.default_zoom_level; 4369 double old_zoom_level = renderer_preferences_.default_zoom_level;
4370 renderer_preferences_ = renderer_prefs; 4370 renderer_preferences_ = renderer_prefs;
4371 UpdateFontRenderingFromRendererPrefs(); 4371 UpdateFontRenderingFromRendererPrefs();
4372 #if defined(TOOLKIT_GTK) 4372 #if defined(TOOLKIT_GTK)
4373 WebColorName name = WebKit::WebColorWebkitFocusRingColor; 4373 WebColorName name = WebKit::WebColorWebkitFocusRingColor;
4374 WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); 4374 WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1);
4375 WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); 4375 WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval);
4376 gfx::NativeTheme::instance()->SetScrollbarColors( 4376 ui::NativeTheme::instance()->SetScrollbarColors(
4377 renderer_prefs.thumb_inactive_color, 4377 renderer_prefs.thumb_inactive_color,
4378 renderer_prefs.thumb_active_color, 4378 renderer_prefs.thumb_active_color,
4379 renderer_prefs.track_color); 4379 renderer_prefs.track_color);
4380 #endif 4380 #endif
4381 4381
4382 #if defined(USE_ASH) || defined(TOOLKIT_GTK) 4382 #if defined(USE_ASH) || defined(TOOLKIT_GTK)
4383 if (webview()) { 4383 if (webview()) {
4384 #if defined(TOOLKIT_GTK) 4384 #if defined(TOOLKIT_GTK)
4385 webview()->setScrollbarColors( 4385 webview()->setScrollbarColors(
4386 renderer_prefs.thumb_inactive_color, 4386 renderer_prefs.thumb_inactive_color,
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
4537 // http://b/issue?id=753080. 4537 // http://b/issue?id=753080.
4538 webview()->dispatchUnloadEvent(); 4538 webview()->dispatchUnloadEvent();
4539 4539
4540 Send(new ViewHostMsg_ClosePage_ACK(routing_id_)); 4540 Send(new ViewHostMsg_ClosePage_ACK(routing_id_));
4541 } 4541 }
4542 4542
4543 void RenderViewImpl::OnThemeChanged() { 4543 void RenderViewImpl::OnThemeChanged() {
4544 #if defined(USE_AURA) 4544 #if defined(USE_AURA)
4545 // Aura doesn't care if we switch themes. 4545 // Aura doesn't care if we switch themes.
4546 #elif defined(OS_WIN) 4546 #elif defined(OS_WIN)
4547 gfx::NativeThemeWin::instance()->CloseHandles(); 4547 ui::NativeThemeWin::instance()->CloseHandles();
4548 if (webview()) 4548 if (webview())
4549 webview()->themeChanged(); 4549 webview()->themeChanged();
4550 #else // defined(OS_WIN) 4550 #else // defined(OS_WIN)
4551 // TODO(port): we don't support theming on non-Windows platforms yet 4551 // TODO(port): we don't support theming on non-Windows platforms yet
4552 NOTIMPLEMENTED(); 4552 NOTIMPLEMENTED();
4553 #endif 4553 #endif
4554 } 4554 }
4555 4555
4556 void RenderViewImpl::OnDisassociateFromPopupCount() { 4556 void RenderViewImpl::OnDisassociateFromPopupCount() {
4557 if (decrement_shared_popup_at_destruction_) 4557 if (decrement_shared_popup_at_destruction_)
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
5313 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5313 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5314 return !!RenderThreadImpl::current()->compositor_thread(); 5314 return !!RenderThreadImpl::current()->compositor_thread();
5315 } 5315 }
5316 5316
5317 void RenderViewImpl::OnJavaBridgeInit() { 5317 void RenderViewImpl::OnJavaBridgeInit() {
5318 DCHECK(!java_bridge_dispatcher_); 5318 DCHECK(!java_bridge_dispatcher_);
5319 #if defined(ENABLE_JAVA_BRIDGE) 5319 #if defined(ENABLE_JAVA_BRIDGE)
5320 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5320 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5321 #endif 5321 #endif
5322 } 5322 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc ('k') | ui/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698