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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_view.cc

Issue 7015051: Re-land: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/panels/panel_browser_view.h" 5 #include "chrome/browser/ui/panels/panel_browser_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/ui/panels/panel.h" 8 #include "chrome/browser/ui/panels/panel.h"
9 #include "chrome/browser/ui/panels/panel_browser_frame_view.h" 9 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
10 #include "chrome/browser/ui/panels/panel_manager.h" 10 #include "chrome/browser/ui/panels/panel_manager.h"
11 #include "chrome/browser/ui/views/frame/browser_frame.h" 11 #include "chrome/browser/ui/views/frame/browser_frame.h"
12 #include "grit/chromium_strings.h" 12 #include "grit/chromium_strings.h"
13 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
14 #include "views/window/window.h" 14 #include "views/window/window.h"
15 15
16 BrowserWindow* Panel::CreateNativePanel(Browser* browser, Panel* panel) { 16 BrowserWindow* Panel::CreateNativePanel(Browser* browser, Panel* panel) {
17 BrowserView* view = new PanelBrowserView(browser, panel); 17 BrowserView* view = new PanelBrowserView(browser, panel);
18 BrowserFrame::Create(view, browser->profile()); 18 (new BrowserFrame(view))->InitBrowserFrame();
19 view->GetWidget()->SetAlwaysOnTop(true); 19 view->GetWidget()->SetAlwaysOnTop(true);
20 view->GetWindow()->non_client_view()->SetAccessibleName( 20 view->GetWindow()->non_client_view()->SetAccessibleName(
21 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 21 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
22 return view; 22 return view;
23 } 23 }
24 24
25 PanelBrowserView::PanelBrowserView(Browser* browser, Panel* panel) 25 PanelBrowserView::PanelBrowserView(Browser* browser, Panel* panel)
26 : BrowserView(browser), 26 : BrowserView(browser),
27 panel_(panel), 27 panel_(panel),
28 mouse_pressed_(false), 28 mouse_pressed_(false),
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 mouse_pressed_ = false; 95 mouse_pressed_ = false;
96 96
97 if (mouse_dragging_) { 97 if (mouse_dragging_) {
98 mouse_dragging_ = false; 98 mouse_dragging_ = false;
99 panel_->manager()->EndDragging(false); 99 panel_->manager()->EndDragging(false);
100 } else { 100 } else {
101 panel_->manager()->EndDragging(true); 101 panel_->manager()->EndDragging(true);
102 } 102 }
103 return true; 103 return true;
104 } 104 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698