| 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
|
|
|