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

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

Issue 2194893002: services/ui: Revert CLs that broke Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_mus.h" 5 #include "chrome/browser/ui/views/frame/browser_frame_mus.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "chrome/browser/ui/views/frame/browser_frame.h" 9 #include "chrome/browser/ui/views/frame/browser_frame.h"
10 #include "chrome/browser/ui/views/frame/browser_view.h" 10 #include "chrome/browser/ui/views/frame/browser_view.h"
(...skipping 21 matching lines...) Expand all
32 properties[ui::mojom::WindowManager::kAppID_Property] = 32 properties[ui::mojom::WindowManager::kAppID_Property] =
33 mojo::ConvertTo<std::vector<uint8_t>>(chrome_app_id); 33 mojo::ConvertTo<std::vector<uint8_t>>(chrome_app_id);
34 return views::WindowManagerConnection::Get()->NewWindow(properties); 34 return views::WindowManagerConnection::Get()->NewWindow(properties);
35 } 35 }
36 36
37 } // namespace 37 } // namespace
38 38
39 BrowserFrameMus::BrowserFrameMus(BrowserFrame* browser_frame, 39 BrowserFrameMus::BrowserFrameMus(BrowserFrame* browser_frame,
40 BrowserView* browser_view) 40 BrowserView* browser_view)
41 : views::NativeWidgetMus(browser_frame, 41 : views::NativeWidgetMus(browser_frame,
42 views::WindowManagerConnection::Get()->connector(),
42 CreateMusWindow(browser_view), 43 CreateMusWindow(browser_view),
43 ui::mojom::SurfaceType::DEFAULT), 44 ui::mojom::SurfaceType::DEFAULT),
44 browser_view_(browser_view) {} 45 browser_view_(browser_view) {}
45 46
46 BrowserFrameMus::~BrowserFrameMus() {} 47 BrowserFrameMus::~BrowserFrameMus() {}
47 48
48 views::Widget::InitParams BrowserFrameMus::GetWidgetParams() { 49 views::Widget::InitParams BrowserFrameMus::GetWidgetParams() {
49 views::Widget::InitParams params(GetWidgetParamsImpl(browser_view_)); 50 views::Widget::InitParams params(GetWidgetParamsImpl(browser_view_));
50 params.native_widget = this; 51 params.native_widget = this;
51 return params; 52 return params;
(...skipping 18 matching lines...) Expand all
70 } 71 }
71 72
72 int BrowserFrameMus::GetMinimizeButtonOffset() const { 73 int BrowserFrameMus::GetMinimizeButtonOffset() const {
73 return 0; 74 return 0;
74 } 75 }
75 76
76 void BrowserFrameMus::UpdateClientArea() { 77 void BrowserFrameMus::UpdateClientArea() {
77 // BrowserNonClientFrameViewMus::OnBoundsChanged() takes care of updating 78 // BrowserNonClientFrameViewMus::OnBoundsChanged() takes care of updating
78 // the insets. 79 // the insets.
79 } 80 }
OLDNEW
« no previous file with comments | « ash/touch_hud/mus/touch_hud_application.cc ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698