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

Side by Side Diff: chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.cc

Issue 23614007: Use the normal Google logo for managed users for --enable-instant-extended-api (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed mac compile failure Created 7 years, 3 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/frame/browser_desktop_root_window_host_win.h" 5 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 8
9 #include "chrome/browser/lifetime/application_lifetime.h" 9 #include "chrome/browser/lifetime/application_lifetime.h"
10 #include "chrome/browser/themes/theme_service.h" 10 #include "chrome/browser/themes/theme_service.h"
(...skipping 27 matching lines...) Expand all
38 : delegate_(delegate) { 38 : delegate_(delegate) {
39 } 39 }
40 40
41 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE { 41 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE {
42 return delegate_->GetImageSkiaNamed( 42 return delegate_->GetImageSkiaNamed(
43 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); 43 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
44 } 44 }
45 virtual SkColor GetColor(int id) const OVERRIDE { 45 virtual SkColor GetColor(int id) const OVERRIDE {
46 return delegate_->GetColor(id); 46 return delegate_->GetColor(id);
47 } 47 }
48 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE { 48 virtual int GetDisplayProperty(int id) const OVERRIDE {
49 return delegate_->GetDisplayProperty(id, result); 49 return delegate_->GetDisplayProperty(id);
50 } 50 }
51 virtual bool ShouldUseNativeFrame() const OVERRIDE { 51 virtual bool ShouldUseNativeFrame() const OVERRIDE {
52 return delegate_->ShouldUseNativeFrame(); 52 return delegate_->ShouldUseNativeFrame();
53 } 53 }
54 virtual bool HasCustomImage(int id) const OVERRIDE { 54 virtual bool HasCustomImage(int id) const OVERRIDE {
55 return delegate_->HasCustomImage( 55 return delegate_->HasCustomImage(
56 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); 56 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
57 57
58 } 58 }
59 virtual base::RefCountedMemory* GetRawData( 59 virtual base::RefCountedMemory* GetRawData(
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 290 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
291 const gfx::Rect& initial_bounds, 291 const gfx::Rect& initial_bounds,
292 BrowserView* browser_view, 292 BrowserView* browser_view,
293 BrowserFrame* browser_frame) { 293 BrowserFrame* browser_frame) {
294 return new BrowserDesktopRootWindowHostWin(native_widget_delegate, 294 return new BrowserDesktopRootWindowHostWin(native_widget_delegate,
295 desktop_native_widget_aura, 295 desktop_native_widget_aura,
296 initial_bounds, 296 initial_bounds,
297 browser_view, 297 browser_view,
298 browser_frame); 298 browser_frame);
299 } 299 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ntp_background_util.cc ('k') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698