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

Side by Side Diff: ui/base/material_design/material_design_controller.cc

Issue 2067013002: Removed InkDropFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed views:: -> ui:: compile error. Created 4 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/base/material_design/material_design_controller.h"
6
5 #include <string> 7 #include <string>
6 8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "base/trace_event/trace_event.h" 11 #include "base/trace_event/trace_event.h"
10 #include "ui/base/material_design/material_design_controller.h"
11 #include "ui/base/ui_base_switches.h" 12 #include "ui/base/ui_base_switches.h"
12 13
13 #if defined(OS_CHROMEOS) 14 #if defined(OS_CHROMEOS)
14 #include "ui/base/touch/touch_device.h" 15 #include "ui/base/touch/touch_device.h"
15 #include "ui/events/devices/device_data_manager.h" 16 #include "ui/events/devices/device_data_manager.h"
16 17
17 #if defined(USE_OZONE) 18 #if defined(USE_OZONE)
18 #include <fcntl.h> 19 #include <fcntl.h>
19 20
20 #include "base/files/file_enumerator.h" 21 #include "base/files/file_enumerator.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 is_mode_initialized_ = false; 119 is_mode_initialized_ = false;
119 } 120 }
120 121
121 // static 122 // static
122 void MaterialDesignController::SetMode(MaterialDesignController::Mode mode) { 123 void MaterialDesignController::SetMode(MaterialDesignController::Mode mode) {
123 mode_ = mode; 124 mode_ = mode;
124 is_mode_initialized_ = true; 125 is_mode_initialized_ = true;
125 } 126 }
126 127
127 } // namespace ui 128 } // namespace ui
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_button.cc ('k') | ui/views/animation/ink_drop_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698