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

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

Issue 12257014: Revert 182281 - Broke Chome Frame tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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/browser_frame_common_win.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_frame_common_win.cc (revision 182293)
+++ chrome/browser/ui/views/frame/browser_frame_common_win.cc (working copy)
@@ -1,34 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/views/frame/browser_frame_common_win.h"
-
-#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "ui/base/theme_provider.h"
-#include "ui/views/widget/native_widget_private.h"
-
-namespace chrome {
-
-bool ShouldUseNativeFrame(
- const views::internal::NativeWidgetPrivate* native_widget,
- const BrowserView* browser_view,
- const ui::ThemeProvider* theme_provider) {
- // App panel windows draw their own frame.
- if (browser_view->IsPanel())
- return false;
-
- // We don't theme popup or app windows, so regardless of whether or not a
- // theme is active for normal browser windows, we don't want to use the custom
- // frame for popups/apps.
- if (!browser_view->IsBrowserTypeNormal() &&
- native_widget->ShouldUseNativeFrame()) {
- return true;
- }
- // Otherwise, we use the native frame when we're told we should by the theme
- // provider (e.g. no custom theme is active).
- return theme_provider->ShouldUseNativeFrame();
-}
-
-} // namespace browser
-
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_common_win.h ('k') | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698