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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_aura.cc

Issue 10913237: Allow the Views Delegate to provide the native widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_aura.h" 5 #include "chrome/browser/ui/views/frame/browser_frame_aura.h"
6 6
7 #include "base/command_line.h"
7 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/ui/views/frame/browser_view.h" 9 #include "chrome/browser/ui/views/frame/browser_view.h"
10 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
9 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" 11 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
10 #include "grit/chromium_strings.h" 12 #include "grit/chromium_strings.h"
11 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
12 #include "ui/aura/client/aura_constants.h" 14 #include "ui/aura/client/aura_constants.h"
13 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
14 #include "ui/aura/window_observer.h" 16 #include "ui/aura/window_observer.h"
15 #include "ui/base/hit_test.h" 17 #include "ui/base/hit_test.h"
16 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/models/simple_menu_model.h" 19 #include "ui/base/models/simple_menu_model.h"
18 #include "ui/gfx/font.h" 20 #include "ui/gfx/font.h"
19 #include "ui/views/controls/menu/menu_model_adapter.h" 21 #include "ui/views/controls/menu/menu_model_adapter.h"
20 #include "ui/views/controls/menu/menu_runner.h" 22 #include "ui/views/controls/menu/menu_runner.h"
21 #include "ui/views/view.h" 23 #include "ui/views/view.h"
24 #include "ui/views/views_switches.h"
22 25
23 #if defined(USE_ASH) 26 #if defined(USE_ASH)
24 #include "ash/wm/property_util.h" 27 #include "ash/wm/property_util.h"
25 #endif 28 #endif
26 29
27 using aura::Window; 30 using aura::Window;
28 31
29 //////////////////////////////////////////////////////////////////////////////// 32 ////////////////////////////////////////////////////////////////////////////////
30 // BrowserFrameAura::WindowPropertyWatcher 33 // BrowserFrameAura::WindowPropertyWatcher
31 34
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 return *title_font; 183 return *title_font;
181 } 184 }
182 185
183 //////////////////////////////////////////////////////////////////////////////// 186 ////////////////////////////////////////////////////////////////////////////////
184 // NativeBrowserFrame, public: 187 // NativeBrowserFrame, public:
185 188
186 // static 189 // static
187 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( 190 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
188 BrowserFrame* browser_frame, 191 BrowserFrame* browser_frame,
189 BrowserView* browser_view) { 192 BrowserView* browser_view) {
193 if (CommandLine::ForCurrentProcess()->HasSwitch(views::switches::kWinAura))
194 return new DesktopBrowserFrameAura(browser_frame, browser_view);
190 return new BrowserFrameAura(browser_frame, browser_view); 195 return new BrowserFrameAura(browser_frame, browser_view);
191 } 196 }
192 197
193 /////////////////////////////////////////////////////////////////////////////// 198 ///////////////////////////////////////////////////////////////////////////////
194 // BrowserFrameAura, private: 199 // BrowserFrameAura, private:
195 200
196 BrowserFrameAura::~BrowserFrameAura() { 201 BrowserFrameAura::~BrowserFrameAura() {
197 } 202 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698