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

Side by Side Diff: chrome/browser/views/frame/browser_frame_gtk.cc

Issue 1141005: Revert r42156, r42157, r42160. Allow dynamic switching in and out of sidetabs... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 9 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/views/frame/browser_frame_gtk.h" 5 #include "chrome/browser/views/frame/browser_frame_gtk.h"
6 6
7 #include "app/gfx/font.h" 7 #include "app/gfx/font.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/browser/browser_theme_provider.h" 9 #include "chrome/browser/browser_theme_provider.h"
10 #include "chrome/browser/profile.h" 10 #include "chrome/browser/profile.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } 95 }
96 GetNonClientView()->SetFrameView(browser_frame_view_); 96 GetNonClientView()->SetFrameView(browser_frame_view_);
97 WindowGtk::Init(NULL, gfx::Rect()); 97 WindowGtk::Init(NULL, gfx::Rect());
98 // Don't focus anything on creation, selecting a tab will set the focus. 98 // Don't focus anything on creation, selecting a tab will set the focus.
99 } 99 }
100 100
101 views::Window* BrowserFrameGtk::GetWindow() { 101 views::Window* BrowserFrameGtk::GetWindow() {
102 return this; 102 return this;
103 } 103 }
104 104
105 void BrowserFrameGtk::TabStripCreated(BaseTabStrip* tabstrip) {
106 }
107
105 int BrowserFrameGtk::GetMinimizeButtonOffset() const { 108 int BrowserFrameGtk::GetMinimizeButtonOffset() const {
106 NOTIMPLEMENTED(); 109 NOTIMPLEMENTED();
107 return 0; 110 return 0;
108 } 111 }
109 112
110 gfx::Rect BrowserFrameGtk::GetBoundsForTabStrip(BaseTabStrip* tabstrip) const { 113 gfx::Rect BrowserFrameGtk::GetBoundsForTabStrip(BaseTabStrip* tabstrip) const {
111 return browser_frame_view_->GetBoundsForTabStrip(tabstrip); 114 return browser_frame_view_->GetBoundsForTabStrip(tabstrip);
112 } 115 }
113 116
114 void BrowserFrameGtk::UpdateThrobber(bool running) { 117 void BrowserFrameGtk::UpdateThrobber(bool running) {
(...skipping 14 matching lines...) Expand all
129 return false; 132 return false;
130 } 133 }
131 134
132 views::View* BrowserFrameGtk::GetFrameView() const { 135 views::View* BrowserFrameGtk::GetFrameView() const {
133 return browser_frame_view_; 136 return browser_frame_view_;
134 } 137 }
135 138
136 void BrowserFrameGtk::PaintTabStripShadow(gfx::Canvas* canvas) { 139 void BrowserFrameGtk::PaintTabStripShadow(gfx::Canvas* canvas) {
137 } 140 }
138 141
139 void BrowserFrameGtk::TabStripDisplayModeChanged() {
140 }
141
142 ThemeProvider* BrowserFrameGtk::GetThemeProvider() const { 142 ThemeProvider* BrowserFrameGtk::GetThemeProvider() const {
143 return profile_->GetThemeProvider(); 143 return profile_->GetThemeProvider();
144 } 144 }
145 145
146 ThemeProvider* BrowserFrameGtk::GetDefaultThemeProvider() const { 146 ThemeProvider* BrowserFrameGtk::GetDefaultThemeProvider() const {
147 return profile_->GetThemeProvider(); 147 return profile_->GetThemeProvider();
148 } 148 }
149 149
150 views::RootView* BrowserFrameGtk::CreateRootView() { 150 views::RootView* BrowserFrameGtk::CreateRootView() {
151 root_view_ = new BrowserRootView(browser_view_, this); 151 root_view_ = new BrowserRootView(browser_view_, this);
(...skipping 28 matching lines...) Expand all
180 if (was_full_screen != IsFullscreen()) 180 if (was_full_screen != IsFullscreen())
181 browser_view_->FullScreenStateChanged(); 181 browser_view_->FullScreenStateChanged();
182 return result; 182 return result;
183 } 183 }
184 184
185 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget, 185 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget,
186 GdkEventConfigure* event) { 186 GdkEventConfigure* event) {
187 browser_view_->WindowMoved(); 187 browser_view_->WindowMoved();
188 return views::WindowGtk::OnConfigureEvent(widget, event); 188 return views::WindowGtk::OnConfigureEvent(widget, event);
189 } 189 }
OLDNEW
« no previous file with comments | « chrome/browser/views/frame/browser_frame_gtk.h ('k') | chrome/browser/views/frame/browser_frame_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698