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

Side by Side Diff: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 (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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_
7 7
8 #include "base/macros.h"
8 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" 9 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h"
9 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h" 10 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"
10 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 11 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
11 12
12 class BrowserFrame; 13 class BrowserFrame;
13 class BrowserView; 14 class BrowserView;
14 15
15 namespace views { 16 namespace views {
16 class DesktopNativeWidgetAura; 17 class DesktopNativeWidgetAura;
17 } 18 }
(...skipping 24 matching lines...) Expand all
42 43
43 // Each browser frame maintains its own menu bar object because the lower 44 // Each browser frame maintains its own menu bar object because the lower
44 // level dbus protocol associates a xid to a menu bar; we can't map multiple 45 // level dbus protocol associates a xid to a menu bar; we can't map multiple
45 // xids to the same menu bar. 46 // xids to the same menu bar.
46 scoped_ptr<GlobalMenuBarX11> global_menu_bar_x11_; 47 scoped_ptr<GlobalMenuBarX11> global_menu_bar_x11_;
47 48
48 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostX11); 49 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostX11);
49 }; 50 };
50 51
51 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ 52 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698