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

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

Issue 5747001: Add the virtual keyboard to BrowserFrameChromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 10 years 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_win.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc
index 716e4fc8f79c595761b42d5a3ecc5c891b120119..af22a58b0082a175d8b3fd6588b9a40e5a2532df 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_win.cc
@@ -15,12 +15,10 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/themes/browser_theme_provider.h"
-#include "chrome/browser/views/frame/app_panel_browser_frame_view.h"
#include "chrome/browser/views/frame/browser_non_client_frame_view.h"
#include "chrome/browser/views/frame/browser_root_view.h"
#include "chrome/browser/views/frame/browser_view.h"
#include "chrome/browser/views/frame/glass_browser_frame_view.h"
-#include "chrome/browser/views/frame/opaque_browser_frame_view.h"
#include "grit/theme_resources.h"
#include "views/screen.h"
#include "views/window/window_delegate.h"
@@ -266,10 +264,9 @@ void BrowserFrameWin::Activate() {
views::NonClientFrameView* BrowserFrameWin::CreateFrameViewForWindow() {
if (AlwaysUseNativeFrame())
browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_);
- else if (browser_view_->IsBrowserTypePanel())
- browser_frame_view_ = new AppPanelBrowserFrameView(this, browser_view_);
else
- browser_frame_view_ = new OpaqueBrowserFrameView(this, browser_view_);
+ browser_frame_view_ =
+ browser::CreateBrowserNonClientFrameView(this, browser_view_);
return browser_frame_view_;
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_gtk.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698