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

Unified Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/glass_browser_frame_view.cc
===================================================================
--- chrome/browser/ui/views/frame/glass_browser_frame_view.cc (revision 71854)
+++ chrome/browser/ui/views/frame/glass_browser_frame_view.cc (working copy)
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
#include "app/resource_bundle.h"
-#include "app/theme_provider.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/themes/browser_theme_provider.h"
@@ -17,6 +16,7 @@
#include "gfx/icon_util.h"
#include "grit/app_resources.h"
#include "grit/theme_resources.h"
+#include "ui/base/theme_provider.h"
#include "views/window/client_view.h"
#include "views/window/window_resources.h"
@@ -243,7 +243,7 @@
}
void GlassBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) {
- ThemeProvider* tp = GetThemeProvider();
+ ui::ThemeProvider* tp = GetThemeProvider();
gfx::Rect toolbar_bounds(browser_view_->GetToolbarBounds());
gfx::Point toolbar_origin(toolbar_bounds.origin());
@@ -360,7 +360,7 @@
}
void GlassBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
- ThemeProvider* tp = GetThemeProvider();
+ ui::ThemeProvider* tp = GetThemeProvider();
gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
// The client edges start below the toolbar upper corner images regardless
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698