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

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

Issue 10816004: Fixes missing 5 pixel inset for theme background in Ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
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 #include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h" 5 #include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h"
6 6
7 #include "base/debug/stack_trace.h" 7 #include "base/debug/stack_trace.h"
8 #include "chrome/browser/ui/views/frame/browser_frame.h" 8 #include "chrome/browser/ui/views/frame/browser_frame.h"
9 #include "chrome/browser/ui/views/frame/browser_view.h" 9 #include "chrome/browser/ui/views/frame/browser_view.h"
10 #include "grit/generated_resources.h" // Accessibility names 10 #include "grit/generated_resources.h" // Accessibility names
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 gfx::Rect AppNonClientFrameViewAura::GetBoundsForTabStrip( 225 gfx::Rect AppNonClientFrameViewAura::GetBoundsForTabStrip(
226 views::View* tabstrip) const { 226 views::View* tabstrip) const {
227 return gfx::Rect(); 227 return gfx::Rect();
228 } 228 }
229 229
230 BrowserNonClientFrameView::TabStripInsets 230 BrowserNonClientFrameView::TabStripInsets
231 AppNonClientFrameViewAura::GetTabStripInsets(bool restored) const { 231 AppNonClientFrameViewAura::GetTabStripInsets(bool restored) const {
232 return TabStripInsets(); 232 return TabStripInsets();
233 } 233 }
234 234
235 int AppNonClientFrameViewAura::GetThemeBackgroundXInset() const {
236 return 0;
237 }
238
235 void AppNonClientFrameViewAura::UpdateThrobber(bool running) { 239 void AppNonClientFrameViewAura::UpdateThrobber(bool running) {
236 } 240 }
237 241
238 void AppNonClientFrameViewAura::OnMouseEntered( 242 void AppNonClientFrameViewAura::OnMouseEntered(
239 const views::MouseEvent& event) { 243 const views::MouseEvent& event) {
240 if (!control_view_) { 244 if (!control_view_) {
241 // This can only happen when the frame-view (|this|) is in the process of 245 // This can only happen when the frame-view (|this|) is in the process of
242 // destroying itself, but the control-widget has already closed, and some 246 // destroying itself, but the control-widget has already closed, and some
243 // mouse event (possibly queued in the event-stream) has arrived. In such 247 // mouse event (possibly queued in the event-stream) has arrived. In such
244 // cases, do not do anything. 248 // cases, do not do anything.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 bool AppNonClientFrameViewAura::IsShowingControls() const { 321 bool AppNonClientFrameViewAura::IsShowingControls() const {
318 return control_widget_ && control_widget_->IsVisible(); 322 return control_widget_ && control_widget_->IsVisible();
319 } 323 }
320 324
321 void AppNonClientFrameViewAura::Restore() { 325 void AppNonClientFrameViewAura::Restore() {
322 if (control_widget_) 326 if (control_widget_)
323 control_widget_->Close(); 327 control_widget_->Close();
324 mouse_watcher_.Stop(); 328 mouse_watcher_.Stop();
325 frame()->Restore(); 329 frame()->Restore();
326 } 330 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698