OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ui/views/frame/browser_frame.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame.h" |
6 #include "chrome/browser/ui/views/frame/browser_view.h" | 6 #include "chrome/browser/ui/views/frame/browser_view.h" |
7 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" | 7 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" |
8 #include "chrome/grit/chromium_strings.h" | 8 #include "chrome/grit/chromium_strings.h" |
| 9 #if defined(USE_AURA) |
9 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 12 #endif |
11 #include "ui/base/l10n/l10n_util.h" | 13 #include "ui/base/l10n/l10n_util.h" |
12 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
13 | 15 |
14 // static | 16 // static |
15 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser, | 17 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser, |
16 bool user_gesture) { | 18 bool user_gesture) { |
17 // Create the view and the frame. The frame will attach itself via the view | 19 // Create the view and the frame. The frame will attach itself via the view |
18 // so we don't need to do anything with the pointer. | 20 // so we don't need to do anything with the pointer. |
19 BrowserView* view = new BrowserView(); | 21 BrowserView* view = new BrowserView(); |
20 view->Init(browser); | 22 view->Init(browser); |
21 (new BrowserFrame(view))->InitBrowserFrame(); | 23 (new BrowserFrame(view))->InitBrowserFrame(); |
22 view->GetWidget()->non_client_view()->SetAccessibleName( | 24 view->GetWidget()->non_client_view()->SetAccessibleName( |
23 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 25 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
24 // For now, all browser windows are true. | 26 |
| 27 #if defined(USE_AURA) |
| 28 // For now, all browser windows are true. This only works when USE_AURA |
| 29 // because it requires gfx::NativeWindow to be an aura::Window*. |
25 view->GetWidget()->GetNativeWindow()->SetProperty( | 30 view->GetWidget()->GetNativeWindow()->SetProperty( |
26 aura::client::kCreatedByUserGesture, user_gesture); | 31 aura::client::kCreatedByUserGesture, user_gesture); |
| 32 #endif |
27 return view; | 33 return view; |
28 } | 34 } |
OLD | NEW |