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

Side by Side Diff: chrome/browser/views/fullscreen_exit_bubble.cc

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/fullscreen_exit_bubble.h" 5 #include "chrome/browser/views/fullscreen_exit_bubble.h"
6 6
7 #include "app/keyboard_codes.h" 7 #include "app/keyboard_codes.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "chrome/app/chrome_dll_resource.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "gfx/canvas_skia.h" 11 #include "gfx/canvas_skia.h"
12 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
13 #include "views/screen.h" 13 #include "views/screen.h"
14 #include "views/widget/root_view.h" 14 #include "views/widget/root_view.h"
15 #include "views/window/window.h" 15 #include "views/window/window.h"
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 #include "app/l10n_util_win.h" 18 #include "app/l10n_util_win.h"
19 #include "views/widget/widget_win.h" 19 #include "views/widget/widget_win.h"
20 #elif defined(OS_LINUX) 20 #elif defined(OS_LINUX)
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 } 279 }
280 // NOTE: don't use the bounds of the root_view_. On linux changing window 280 // NOTE: don't use the bounds of the root_view_. On linux changing window
281 // size is async. Instead we use the size of the screen. 281 // size is async. Instead we use the size of the screen.
282 gfx::Rect screen_bounds = views::Screen::GetMonitorAreaNearestWindow( 282 gfx::Rect screen_bounds = views::Screen::GetMonitorAreaNearestWindow(
283 root_view_->GetWidget()->GetNativeView()); 283 root_view_->GetWidget()->GetNativeView());
284 gfx::Point origin(screen_bounds.x() + 284 gfx::Point origin(screen_bounds.x() +
285 (screen_bounds.width() - size.width()) / 2, 285 (screen_bounds.width() - size.width()) / 2,
286 screen_bounds.y()); 286 screen_bounds.y());
287 return gfx::Rect(origin, size); 287 return gfx::Rect(origin, size);
288 } 288 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698