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

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

Issue 1457353002: Aura Android: Add implementation for two factory methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reviews Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc
similarity index 80%
rename from chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
rename to chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc
index 5263ea971611b71ece12807cf50fb4b592c34632..c7ae34f021c8bc9649282b5e62439c4aa515da25 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 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_view.h"
-
#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+
#if !defined(OS_CHROMEOS)
#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
#endif
@@ -17,10 +17,11 @@
namespace chrome {
BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
- BrowserFrame* frame, BrowserView* browser_view) {
+ BrowserFrame* frame,
+ BrowserView* browser_view) {
#if !defined(OS_CHROMEOS)
- if (browser_view->browser()->
- host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
+ if (browser_view->browser()->host_desktop_type() ==
+ chrome::HOST_DESKTOP_TYPE_NATIVE) {
#if defined(OS_WIN)
if (frame->ShouldUseNativeFrame())
return new GlassBrowserFrameView(frame, browser_view);

Powered by Google App Engine
This is Rietveld 408576698