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

Unified Diff: chrome/browser/chromeos/frame/browser_frame_chromeos.cc

Issue 5747001: Add the virtual keyboard to BrowserFrameChromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clean-up 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/chromeos/frame/browser_frame_chromeos.cc
diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
index e56126ceacd2a0f27a482fce3a9a0ce8efb513b2..936b4f2e2a1dc71fed0e38d87659a3130de1483f 100644
--- a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
+++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
@@ -5,9 +5,8 @@
#include "chrome/browser/chromeos/frame/browser_frame_chromeos.h"
#include "base/command_line.h"
-#include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/browser/views/frame/opaque_browser_frame_view.h"
-#include "chrome/browser/views/frame/popup_non_client_frame_view.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
#include "chrome/common/chrome_switches.h"
// static (Factory method.)
@@ -32,14 +31,9 @@ BrowserFrameChromeos::~BrowserFrameChromeos() {
void BrowserFrameChromeos::Init() {
// NOTE: This logic supersedes the logic in BrowserFrameGtk::Init()
// by always setting browser_frame_view_.
- bool is_popup = browser_view()->IsBrowserTypePopup();
- if (is_popup) {
- // ChromeOS Panels should always use PopupNonClientFrameView.
- set_browser_frame_view(new PopupNonClientFrameView());
- } else {
- // Default FrameView.
- set_browser_frame_view(new OpaqueBrowserFrameView(this, browser_view()));
- }
+ bool is_popup = browser_view()->IsBrowserTypePanel();
sky 2010/12/10 18:18:20 This doesn't match the old code. Does it matter?
bryeung 2010/12/10 23:58:59 Good catch! Silly copy-paste error.
+ set_browser_frame_view(
+ browser::CreateBrowserNonClientFrameView(is_popup, this, browser_view()));
BrowserFrameGtk::Init();

Powered by Google App Engine
This is Rietveld 408576698