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

Side by Side Diff: chrome/browser/views/frame/opaque_browser_frame_view.cc

Issue 361018: Ensure that overlay does not appear in incognito mode.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month 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 | « no previous file | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/views/frame/opaque_browser_frame_view.h" 5 #include "chrome/browser/views/frame/opaque_browser_frame_view.h"
6 6
7 #include "app/gfx/canvas.h" 7 #include "app/gfx/canvas.h"
8 #include "app/gfx/font.h" 8 #include "app/gfx/font.h"
9 #include "app/gfx/path.h" 9 #include "app/gfx/path.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 canvas->FillRectInt(frame_color, 627 canvas->FillRectInt(frame_color,
628 left_edge->width(), height() - bottom_edge->height(), 628 left_edge->width(), height() - bottom_edge->height(),
629 width() - left_edge->width() - right_edge->width(), 629 width() - left_edge->width() - right_edge->width(),
630 bottom_edge->height()); 630 bottom_edge->height());
631 631
632 // Draw the theme frame. 632 // Draw the theme frame.
633 canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height()); 633 canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height());
634 634
635 // Draw the theme frame overlay 635 // Draw the theme frame overlay
636 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && 636 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
637 browser_view_->IsBrowserTypeNormal()) { 637 browser_view_->IsBrowserTypeNormal() &&
638 !browser_view_->IsOffTheRecord()) {
638 SkBitmap* theme_overlay; 639 SkBitmap* theme_overlay;
639 if (ShouldPaintAsActive()) 640 if (ShouldPaintAsActive())
640 theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY); 641 theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY);
641 else 642 else
642 theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE); 643 theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE);
643 canvas->DrawBitmapInt(*theme_overlay, 0, 0); 644 canvas->DrawBitmapInt(*theme_overlay, 0, 0);
644 } 645 }
645 646
646 // Top. 647 // Top.
647 int top_left_height = std::min(top_left_corner->height(), 648 int top_left_height = std::min(top_left_corner->height(),
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 static bool initialized = false; 1078 static bool initialized = false;
1078 if (!initialized) { 1079 if (!initialized) {
1079 #if defined(OS_WIN) 1080 #if defined(OS_WIN)
1080 title_font_ = new gfx::Font(win_util::GetWindowTitleFont()); 1081 title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
1081 #else 1082 #else
1082 title_font_ = new gfx::Font(); 1083 title_font_ = new gfx::Font();
1083 #endif 1084 #endif
1084 initialized = true; 1085 initialized = true;
1085 } 1086 }
1086 } 1087 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698