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

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

Issue 1438513003: [MD] Implement incognito colors as a NativeTheme (for Aura). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iterate on chips Created 5 years, 1 month 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_FRAME_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 // Retrieves the window placement (show state and bounds) for restoring. 95 // Retrieves the window placement (show state and bounds) for restoring.
96 void GetWindowPlacement(gfx::Rect* bounds, 96 void GetWindowPlacement(gfx::Rect* bounds,
97 ui::WindowShowState* show_state) const; 97 ui::WindowShowState* show_state) const;
98 98
99 // Overridden from views::Widget: 99 // Overridden from views::Widget:
100 views::internal::RootView* CreateRootView() override; 100 views::internal::RootView* CreateRootView() override;
101 views::NonClientFrameView* CreateNonClientFrameView() override; 101 views::NonClientFrameView* CreateNonClientFrameView() override;
102 bool GetAccelerator(int command_id, 102 bool GetAccelerator(int command_id,
103 ui::Accelerator* accelerator) const override; 103 ui::Accelerator* accelerator) const override;
104 ui::ThemeProvider* GetThemeProvider() const override; 104 ui::ThemeProvider* GetThemeProvider() const override;
105 const ui::NativeTheme* GetNativeTheme() const override;
105 void SchedulePaintInRect(const gfx::Rect& rect) override; 106 void SchedulePaintInRect(const gfx::Rect& rect) override;
106 void OnNativeWidgetActivationChanged(bool active) override; 107 void OnNativeWidgetActivationChanged(bool active) override;
107 108
108 // Overridden from views::ContextMenuController: 109 // Overridden from views::ContextMenuController:
109 void ShowContextMenuForView(views::View* source, 110 void ShowContextMenuForView(views::View* source,
110 const gfx::Point& p, 111 const gfx::Point& p,
111 ui::MenuSourceType source_type) override; 112 ui::MenuSourceType source_type) override;
112 113
113 AvatarMenuButton* GetAvatarMenuButton(); 114 AvatarMenuButton* GetAvatarMenuButton();
114 115
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // externally). 147 // externally).
147 scoped_ptr<ui::ThemeProvider> owned_theme_provider_; 148 scoped_ptr<ui::ThemeProvider> owned_theme_provider_;
148 ui::ThemeProvider* theme_provider_; 149 ui::ThemeProvider* theme_provider_;
149 150
150 scoped_ptr<ui::EventHandler> browser_command_handler_; 151 scoped_ptr<ui::EventHandler> browser_command_handler_;
151 152
152 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); 153 DISALLOW_COPY_AND_ASSIGN(BrowserFrame);
153 }; 154 };
154 155
155 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ 156 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698