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

Side by Side Diff: extensions/shell/browser/shell_desktop_controller_aura.cc

Issue 1543053002: Switch to standard integer types in extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@int-extensions-browser
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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/shell/browser/shell_desktop_controller_aura.h" 5 #include "extensions/shell/browser/shell_desktop_controller_aura.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/macros.h"
13 #include "build/build_config.h"
12 #include "extensions/browser/app_window/app_window.h" 14 #include "extensions/browser/app_window/app_window.h"
13 #include "extensions/browser/app_window/native_app_window.h" 15 #include "extensions/browser/app_window/native_app_window.h"
14 #include "extensions/shell/browser/shell_app_delegate.h" 16 #include "extensions/shell/browser/shell_app_delegate.h"
15 #include "extensions/shell/browser/shell_app_window_client.h" 17 #include "extensions/shell/browser/shell_app_window_client.h"
16 #include "extensions/shell/browser/shell_screen.h" 18 #include "extensions/shell/browser/shell_screen.h"
17 #include "extensions/shell/common/switches.h" 19 #include "extensions/shell/common/switches.h"
18 #include "ui/aura/client/cursor_client.h" 20 #include "ui/aura/client/cursor_client.h"
19 #include "ui/aura/client/default_capture_client.h" 21 #include "ui/aura/client/default_capture_client.h"
20 #include "ui/aura/layout_manager.h" 22 #include "ui/aura/layout_manager.h"
21 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 if (displays.empty()) 340 if (displays.empty())
339 return gfx::Size(); 341 return gfx::Size();
340 const ui::DisplayMode* mode = displays[0]->current_mode(); 342 const ui::DisplayMode* mode = displays[0]->current_mode();
341 return mode ? mode->size() : gfx::Size(); 343 return mode ? mode->size() : gfx::Size();
342 #else 344 #else
343 return gfx::Size(); 345 return gfx::Size();
344 #endif 346 #endif
345 } 347 }
346 348
347 } // namespace extensions 349 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698