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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 (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/ash/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/session/session_state_delegate.h" 8 #include "ash/session/session_state_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/macros.h"
13 #include "build/build_config.h"
12 #include "chrome/browser/chrome_browser_main.h" 14 #include "chrome/browser/chrome_browser_main.h"
13 #include "chrome/browser/ui/ash/ash_init.h" 15 #include "chrome/browser/ui/ash/ash_init.h"
14 #include "chrome/browser/ui/ash/ash_util.h" 16 #include "chrome/browser/ui/ash/ash_util.h"
15 #include "chrome/browser/ui/views/ash/tab_scrubber.h" 17 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
16 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
17 #include "ui/aura/env.h" 19 #include "ui/aura/env.h"
18 #include "ui/gfx/screen.h" 20 #include "ui/gfx/screen.h"
19 #include "ui/gfx/screen_type_delegate.h" 21 #include "ui/gfx/screen_type_delegate.h"
20 #include "ui/keyboard/content/keyboard.h" 22 #include "ui/keyboard/content/keyboard.h"
21 #include "ui/keyboard/keyboard_controller.h" 23 #include "ui/keyboard/keyboard_controller.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 TabScrubber::GetInstance(); 108 TabScrubber::GetInstance();
107 // Activate virtual keyboard after profile is initialized. It depends on the 109 // Activate virtual keyboard after profile is initialized. It depends on the
108 // default profile. 110 // default profile.
109 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( 111 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
110 keyboard::KeyboardController::GetInstance()); 112 keyboard::KeyboardController::GetInstance());
111 } 113 }
112 114
113 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 115 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
114 chrome::CloseAsh(); 116 chrome::CloseAsh();
115 } 117 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h ('k') | chrome/browser/ui/views/ash/tab_scrubber.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698